[jboss-svn-commits] JBoss Portal SVN: r5450 - in branches/JBoss_Portal_Branch_2_4: api api/src/main/javax/portlet api/src/main/org/jboss/portal api/src/main/org/jboss/portal/api/event api/src/main/org/jboss/portal/api/node api/src/main/org/jboss/portal/api/node/event bridge bridge/src/main/org/jboss/portal/bridge build/ide/intellij/idea50/modules/thirdparty 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/ut! il 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/resources/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 common common/src/main/org/jboss/portal/common common/src/main/org/jboss/portal/common/ant common/src/main/org/jboss/portal/common/command common/src/main/org/jboss/portal/common/command/filter common/src/main/org/jboss/portal/common/command/result common/src/main/org/jboss/portal/common/concurrent common/src/main/org/jboss/portal/common/context common/src/main/org/jboss/portal/common/invocation common/src/main/org/jboss/portal/common/logging common/src/main/org/jboss/portal/common/met! adata common/src/main/org/jboss/portal/common/mx common/src/main/org/jboss/portal/common/net common/src/main/org/jboss/portal/common/net/file common/src/main/org/jboss/portal/common/net/jar common/src/main/org/jboss/portal/common/p3p common/src/main/org/jboss/portal/common/path common/src/main/org/jboss/portal/common/plugin

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

Author: chris.laprun at jboss.com
Date: 2006-10-13 17:52:24 -0400 (Fri, 13 Oct 2006)
New Revision: 5450

Modified:
   branches/JBoss_Portal_Branch_2_4/api/build.xml
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionRequest.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionResponse.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/GenericPortlet.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortalContext.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/Portlet.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletConfig.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletContext.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletMode.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletModeException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletPreferences.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequest.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequestDispatcher.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletResponse.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSecurityException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSession.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSessionUtil.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletURL.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PreferencesValidator.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ReadOnlyException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderRequest.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderResponse.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/UnavailableException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ValidatorException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowState.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowStateException.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/event/PortalEvent.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/PortalNode.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/PortalNodeURL.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventContext.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java
   branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java
   branches/JBoss_Portal_Branch_2_4/bridge/build.xml
   branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeInterceptor.java
   branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java
   branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java
   branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java
   branches/JBoss_Portal_Branch_2_4/build/ide/intellij/idea50/modules/thirdparty/thirdparty.iml
   branches/JBoss_Portal_Branch_2_4/cms/build.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMS.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSException.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/Command.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CommandFactory.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/CMSObject.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Content.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/File.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Folder.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/FileUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java
   branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/hibernate/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/fs-repository.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/repository.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/log4j.xml
   branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/pm-cache.xml
   branches/JBoss_Portal_Branch_2_4/common/build.xml
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/FQN.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/MediaType.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/AbstractDeploymentTask.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/CannotCreateDirException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Deploy.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/DirException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Explode.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/FileIsNotDirException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Implode.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Undeploy.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/AbstractCommand.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/AttributeType.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/Command.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/CommandConstants.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/CommandException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/CompositeCommand.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/Configurator.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/EmptyConfigurator.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/NoSuchAttachmentException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/ReflectedConfigurator.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/UnexpectedCommandException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/AbstractCommandFilter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CommandFilter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CompositeFilter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/ExecuteFilter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/CompositeResult.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/ImmutableResult.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/Result.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/ResultType.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/SimpleResult.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/concurrent/Valve.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/AbstractContext.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/BuildException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/ChildrenStrategy.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/Context.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/DelegateContext.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/NamedContext.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Interceptor.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/InterceptorStack.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Invocation.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/InvocationException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/LoaderRepositorySelector.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/Log4JWriter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/metadata/MetaData.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/JavaBeanModelMBeanBuilder.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/Listener.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/ListenerException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/ProxyUnwrapperInterceptor.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/Application_XWWWFormURLEncodedFormat.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigationProvider.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigator.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLVisitor.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/file/FileURLNavigationProvider.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/p3p/P3PConstants.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/path/RelativePathParser.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/AbstractPlugin.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/AbstractPluginContainer.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/AdapterPlugin.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/Plugin.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/PluginContainer.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/PluginContext.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/PluginMetaData.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/CombinedPreferencesResolver.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/Decorators.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/MapPreferences.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/Preferences.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/PreferencesResolver.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/AbstractJBossService.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/JBossService.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/JBossServiceModelMBean.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/LifeCycleAdapter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/NestedException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionManagerProvider.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/Transactions.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Adaptable.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Base64.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/CLLoader.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/CollectionBuilder.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/EmptyResourceBundle.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Exceptions.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/JMX.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/JNDI.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Jar.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LazyMap.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Loader.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LoaderResource.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocaleInfo.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedPropertyResourceBundle.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedString.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/MapResourceBundle.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/NoSuchElementException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParameterMap.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParameterValidation.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParentChildResourceBundle.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ProxyInfo.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/SetMap.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ThrowableBean.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/TooManyElementException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Tools.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/URLTools.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/UUIDGenerator.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Version.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/XML.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/BooleanValue.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ConversionException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Converter.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/FloatValue.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/FormatConversionException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Helper.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/IntegerValue.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/NullConversionException.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/SimpleValueMap.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/StringValue.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Value.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ValueMap.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/Application_XWWWFormURLEncodedFormatTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/DescriptionTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/HexTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ImplodeTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/InvocationTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JarTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JavaBeanModelMBeanBuilderTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/LocaleInfoTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/LocalizedStringTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParameterMapTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParentChildResourceBundleTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PathTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PreferencesTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/StringTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/TemporaryHashTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ThrowableBeanTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/URLToolsTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValueTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValveTestCase.java
   branches/JBoss_Portal_Branch_2_4/common/src/resources/test/implode/foo.sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/common/src/resources/test/implode/foo.sar/bar.war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/core/build.xml
   branches/JBoss_Portal_Branch_2_4/core/src/etc/jboss-aop/base-aop.xml
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreConstants.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreController.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/JBossPortalNode.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/Navigation.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/PortalNodeURLFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/EventBroadcasterInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PortalNodeInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInfo.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ControllerCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ErrorResultException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ExecutionContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowMoveCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/MarkupCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectNotFoundException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectSecurityException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/PortalObjectCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderPageCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderRegionCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowContextCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/SecurityException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/WindowCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/AbstractCommandFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/AbstractURLFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/CommandFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/CommandFactoryDelegate.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingCommandFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingCommandFactoryService.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactoryDelegate.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreRenderContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreUserContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/UserInstance.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/Policy.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/UserIdentity.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/StatefulPortletInvoker.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/Instance.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Context.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/MaskNames.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Page.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Portal.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Window.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/WindowContextImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/modules/AbstractModule.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/modules/MailModule.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/modules/ModuleException.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/output/AuthenticateResult.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/output/SignOutResult.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/NavigationPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminConstants.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/ProxyValidator.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/RewriteHelper.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/MapperTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PageTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/Utils.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/SimpleActionContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/SimpleUserContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/SimpleInstanceContext.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/StatefulPortletInvokerTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossAPIFactory.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionRequest.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionResponse.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortlet.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortletPreferences.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderRequest.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderResponse.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/command/ActionCommand.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/session/PortletSessionListener.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/util/Parameters.java
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-app_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-portlet_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-layouts_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-renderSet_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-strategies_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-themes_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portlet-instances_2_0.dtd
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/data/default-object.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/login-config.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/portal-aop.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/prefs/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/faces-config.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/default-object.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/setup/portal-ds.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/domain.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/local.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/replicated.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarole.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarolecreated.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroledeleted.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroleedited.xml
   branches/JBoss_Portal_Branch_2_4/core/src/resources/test/theme.xml
   branches/JBoss_Portal_Branch_2_4/faces/build.xml
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/TypeDef.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Cell.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Row.java
   branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java
   branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-lib-jar/composite.tld
   branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml
   branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/federation/build.xml
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java
   branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java
   branches/JBoss_Portal_Branch_2_4/format/build.xml
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/AbstractParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEvent.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/TextEvent.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/Token.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Chars.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Filter.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/html/TagParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/AbstractContext.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/BuildException.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Context.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/DelegateContext.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Template.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateLoader.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateParser.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateRepository.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateUtils.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/CLLoader.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/EntityTable.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Loader.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Stack.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java
   branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java
   branches/JBoss_Portal_Branch_2_4/identity/build.xml
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/IdentityException.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/PropertyMap.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/Role.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/RoleModule.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/User.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/UserModule.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/PropertyMapImpl.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserImpl.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTest.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java
   branches/JBoss_Portal_Branch_2_4/identity/src/resources/hibernate/domain.hbm.xml
   branches/JBoss_Portal_Branch_2_4/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/jems/build.xml
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java
   branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java
   branches/JBoss_Portal_Branch_2_4/portlet/build.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ActionURL.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Parameters.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Portlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletURL.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Properties.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/RenderURL.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/StateString.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInvocationContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/RenderInvocation.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/AccessDeniedResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/ErrorResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/FragmentResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/HTTPRedirectionResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/InsufficientPrivilegesResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/InsufficientTransportGuaranteeResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/RedirectionResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/RenderResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/Result.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/SecurityErrorResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/StreamResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/UnavailableResult.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/SoftTimedContent.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/StrongTimedContent.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/TimedContent.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/Modification.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InvocationContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/Property.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/PropertyContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/InvalidStateIdException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/NoSuchStateException.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/State.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StateStore.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InvocationContextSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateSupport.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/portlet-app_1_0.xsd
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/jboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/security/build.xml
   branches/JBoss_Portal_Branch_2_4/security/imports/test-jars.xml
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermission.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalSecurityException.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/SecurityConstants.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatPermission.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/Server.java
   branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java
   branches/JBoss_Portal_Branch_2_4/security/src/resources/log4j.xml
   branches/JBoss_Portal_Branch_2_4/server/build.xml
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/AbstractServerURL.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/PortalConstants.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/RequestController.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/Server.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerException.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInterceptor.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInvocation.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequestContext.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponse.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponseContext.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerURL.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfig.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfigService.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CustomPortalWebApp.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/ServerImpl.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/navigation/NavigationalStateContext.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/RequestParameter.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLContext.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLFormat.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMapping.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathParser.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/AbstractTestCase.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/PortalTestSetup.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/AbstractTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/Utils.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java
   branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/conf/config.xml
   branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-session-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/test/build.xml
   branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/Result.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/ExtendedAssert.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/TransactionAssert.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java
   branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/theme/build.xml
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutConstants.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutException.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutInfo.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutService.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalLayout.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalTheme.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/RuntimeContext.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeConstants.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeElement.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeException.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeInfo.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeLink.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeScript.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeService.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivDecorationRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivPortletRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivRegionRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivWindowRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyDecorationRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyPortletRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyRegionRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyWindowRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/MarkupContainer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageService.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/Region.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionNames.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/UnusableMarkupResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowContext.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderException.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/Renderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java
   branches/JBoss_Portal_Branch_2_4/wsrp/build.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/AccessDeniedFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/BlockingInteractionResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CacheControl.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClientData.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClonePortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Contact.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CookieProtocol.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyFailed.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortlets.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortletsResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/EmployerInfo.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Extension.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Fault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetMarkup.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletProperties.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletPropertyDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetServiceDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InconsistentParametersFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InitCookie.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InteractionParams.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidCookieFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidHandleFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidRegistrationFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidSessionFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidUserCategoryFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ItemDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/LocalizedString.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupParams.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MissingParametersFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelTypes.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModifyRegistration.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/NamedString.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Online.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/OperationFailedFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PerformBlockingInteraction.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PersonName.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescriptionResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletPropertyDescriptionResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletStateChangeRequiredFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Postal.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Property.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyList.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationData.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationState.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReleaseSessions.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResetProperty.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Resource.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceList.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceValue.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReturnAny.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RuntimeContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ServiceDescription.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SessionContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SetPortletProperties.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/StateChange.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Telecom.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/TelephoneNum.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Templates.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedLocaleFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedMimeTypeFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedModeFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedWindowStateFault.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UpdateResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UploadContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserProfile.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRPService.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Markup_PortType.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_PortletManagement_PortType.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Registration_PortType.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_ServiceDescription_PortType.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/ProducerSessionInformationTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/TestWSRPProducer.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/TestWSRPProducerImpl.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPPortletURLTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPProducerBaseTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessageContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/BasicPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/DispatcherPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/EncodeURLPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/GetLocalesPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/MarkupPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/RenderParamPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/BasicInstanceContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/BasicSecurityContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/BasicUserContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MockHttpServletRequest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MockHttpServletResponse.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MockHttpSession.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/SOF.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/TestInvocationContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/V1ConsumerBaseTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/ResponseDebugFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/UserContextConverter.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPActionURL.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPConsumer.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPRenderURL.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPResourceURL.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPRewritingConstants.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/aspects/portlet/DumpInterceptor.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ServiceDescriptionUnavailableException.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/WSRPPortlet.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentMBean.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/handler/WSRPExtensionHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPActionContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPInvocationContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRenderContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRequestContext.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/ServiceFactory.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/RequestDumperFilter.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccess.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccessFilter.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccessService.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/TransactionFilter.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/log4j.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/application-client.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/jboss-client.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_services.wsdl
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/webservices.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-deployment-lib-jar/test-wsrp.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/application-client.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/jboss-client.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/wsdl/wsrp_services.wsdl
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/webservices.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/wsdl/wsrp_services.wsdl
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/application-client.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/jboss-client.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/wsdl/wsrp_services.wsdl
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/jboss-web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/webservices.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/wsdl/wsrp_services.wsdl
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp-webconfig.xml
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp_services.wsdl
Log:
JBPORTAL-1084: updated headers.

Modified: branches/JBoss_Portal_Branch_2_4/api/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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$ -->
 
@@ -32,7 +55,7 @@
    <!--+====================================================================+-->
 
    &buildmagic;
-   
+
    &modules;
    &defaults;
    &tools;
@@ -99,8 +122,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. -->
@@ -115,8 +138,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <mkdir dir="${build.lib}"/>
 

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.BufferedReader;
@@ -27,119 +28,88 @@
 import java.io.UnsupportedEncodingException;
 
 /**
- * The <CODE>ActionRequest</CODE> represents the request sent to the portlet
- * to handle an action.
- * It extends the PortletRequest interface to provide action request
- * information to portlets.<br>
- * The portlet container creates an <CODE>ActionRequest</CODE> object and
- * passes it as argument to the portlet's <CODE>processAction</CODE> method.
+ * The <CODE>ActionRequest</CODE> represents the request sent to the portlet to handle an action. It extends the
+ * PortletRequest interface to provide action request information to portlets.<br> The portlet container creates an
+ * <CODE>ActionRequest</CODE> object and passes it as argument to the portlet's <CODE>processAction</CODE> method.
  *
- * @see PortletRequest
- * @see RenderRequest
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see PortletRequest
+ * @see RenderRequest
  */
 public interface ActionRequest extends PortletRequest
 {
    /**
-    * Returns the name of the character encoding used in the body of this request.
-    * This method returns <code>null</code> if the request
-    * does not specify a character encoding.
+    * Returns the name of the character encoding used in the body of this request. This method returns <code>null</code>
+    * if the request does not specify a character encoding.
     *
-    * @return		a <code>String</code> containing the name of
-    *			the chararacter encoding, or <code>null</code>
-    *			if the request does not specify a character encoding.
+    * @return a <code>String</code> containing the name of the chararacter encoding, or <code>null</code> if the
+    * request does not specify a character encoding.
     */
    String getCharacterEncoding();
 
    /**
-    * Returns the length, in bytes, of the request body
-    * which is made available by the input stream, or -1 if the
-    * length is not known.
+    * Returns the length, in bytes, of the request body which is made available by the input stream, or -1 if the length
+    * is not known.
     *
-    *
-    * @return		an integer containing the length of the
-    * 			request body or -1 if the length is not known
-    *
+    * @return an integer containing the length of the request body or -1 if the length is not known
     */
    int getContentLength();
 
    /**
-    * Returns the MIME type of the body of the request,
-    * or null if the type is not known.
+    * Returns the MIME type of the body of the request, or null if the type is not known.
     *
-    * @return		a <code>String</code> containing the name
-    *			of the MIME type of the request, or null
-    *                    if the type is not known.
+    * @return a <code>String</code> containing the name of the MIME type of the request, or null if the type is not
+    * known.
     */
    String getContentType();
 
    /**
-    * Retrieves the body of the HTTP request from client to
-    * portal as binary data using
-    * an <CODE>InputStream</CODE>. Either this method or
-    * {@link #getReader} may be called to read the body, but not both.
-    * <p>
-    * For HTTP POST data of type application/x-www-form-urlencoded
-    * this method throws an <code>IllegalStateException</code>
-    * as this data has been already processed by the
-    * portal/portlet-container and is available as request parameters.
+    * Retrieves the body of the HTTP request from client to portal as binary data using an <CODE>InputStream</CODE>.
+    * Either this method or {@link #getReader} may be called to read the body, but not both.
+    * <p/>
+    * For HTTP POST data of type application/x-www-form-urlencoded this method throws an
+    * <code>IllegalStateException</code> as this data has been already processed by the portal/portlet-container and is
+    * available as request parameters.
     *
     * @return an input stream containing the body of the request
-    *
-    * @exception java.lang.IllegalStateException
-    *                   if getReader was already called, or it is a
-    *                   HTTP POST data of type application/x-www-form-urlencoded
-    * @exception java.io.IOException
-    *                   if an input or output exception occurred
+    * @throws java.lang.IllegalStateException
+    *                             if getReader was already called, or it is a HTTP POST data of type
+    *                             application/x-www-form-urlencoded
+    * @throws java.io.IOException if an input or output exception occurred
     */
    InputStream getPortletInputStream() throws IllegalStateException, IOException;
 
    /**
-    * Retrieves the body of the HTTP request from the client to the portal
-    * as character data using
-    * a <code>BufferedReader</code>.  The reader translates the character
-    * data according to the character encoding used on the body.
-    * Either this method or {@link #getPortletInputStream} may be called to read the
-    * body, not both.
-    * <p>
-    * For HTTP POST data of type application/x-www-form-urlencoded
-    * this method throws an <code>IllegalStateException</code>
-    * as this data has been already processed by the
-    * portal/portlet-container and is available as request parameters.
+    * Retrieves the body of the HTTP request from the client to the portal as character data using a
+    * <code>BufferedReader</code>.  The reader translates the character data according to the character encoding used on
+    * the body. Either this method or {@link #getPortletInputStream} may be called to read the body, not both.
+    * <p/>
+    * For HTTP POST data of type application/x-www-form-urlencoded this method throws an
+    * <code>IllegalStateException</code> as this data has been already processed by the portal/portlet-container and is
+    * available as request parameters.
     *
-    * @return	a <code>BufferedReader</code>
-    *		containing the body of the request
-    *
-    * @exception  java.io.UnsupportedEncodingException
-    *                 if the character set encoding used is
-    * 		     not supported and the text cannot be decoded
-    * @exception  java.lang.IllegalStateException
-    *                 if {@link #getPortletInputStream} method
-    * 		     has been called on this request,  it is a
-    *                   HTTP POST data of type application/x-www-form-urlencoded.
-    * @exception  java.io.IOException
-    *                 if an input or output exception occurred
-    *
+    * @throws java.io.UnsupportedEncodingException
+    *                             if the character set encoding used is not supported and the text cannot be decoded
+    * @throws java.lang.IllegalStateException
+    *                             if {@link #getPortletInputStream} method has been called on this request,  it is a
+    *                             HTTP POST data of type application/x-www-form-urlencoded.
+    * @throws java.io.IOException if an input or output exception occurred
+    * @return a <code>BufferedReader</code> containing the body of the request
     * @see #getPortletInputStream
     */
    BufferedReader getReader() throws UnsupportedEncodingException, IllegalStateException, IOException;
 
    /**
-    * Overrides the name of the character encoding used in the body of this
-    * request. This method must be called prior to reading input
-    * using {@link #getReader} or {@link #getPortletInputStream}.
-    * <p>
-    * This method only sets the character set for the Reader that the
-    * {@link #getReader} method returns.
+    * Overrides the name of the character encoding used in the body of this request. This method must be called prior to
+    * reading input using {@link #getReader} or {@link #getPortletInputStream}.
+    * <p/>
+    * This method only sets the character set for the Reader that the {@link #getReader} method returns.
     *
-    * @param	enc	a <code>String</code> containing the name of
-    *			the chararacter encoding.
-    *
-    * @exception		java.io.UnsupportedEncodingException if this is not a valid encoding
-    * @exception		java.lang.IllegalStateException      if this method is called after
-    *                                   reading request parameters or reading input using
-    *                                   <code>getReader()</code>
+    * @param   enc   a <code>String</code> containing the name of the chararacter encoding.
+    * @exception java.io.UnsupportedEncodingException if this is not a valid encoding
+    * @exception java.lang.IllegalStateException if this method is called after reading request parameters or reading
+    * input using <code>getReader()</code>
     */
    void setCharacterEncoding(String enc) throws UnsupportedEncodingException, IllegalStateException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ActionResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,207 +1,151 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.IOException;
 import java.util.Map;
 
 /**
- * The <CODE>ActionResponse</CODE> interface represents the portlet
- * response to an action request.
- * It extends the <CODE>PortletResponse</CODE> interface to provide specific
- * action response functionality to portlets.<br>
- * The portlet container creates an <CODE>ActionResponse</CODE> object and
- * passes it as argument to the portlet's <CODE>processAction</CODE> method.
+ * The <CODE>ActionResponse</CODE> interface represents the portlet response to an action request. It extends the
+ * <CODE>PortletResponse</CODE> interface to provide specific action response functionality to portlets.<br> The portlet
+ * container creates an <CODE>ActionResponse</CODE> object and passes it as argument to the portlet's
+ * <CODE>processAction</CODE> method.
  *
- * @see ActionRequest
- * @see PortletResponse
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see ActionRequest
+ * @see PortletResponse
  */
 public interface ActionResponse extends PortletResponse
 {
    /**
     * Sets the window state of a portlet to the given window state.
-    * <p>
-    * Possible values are the standard window states and any custom
-    * window states supported by the portal and the portlet.
-    * Standard window states are:
-    * <ul>
-    * <li>MINIMIZED
-    * <li>NORMAL
-    * <li>MAXIMIZED
-    * </ul>
+    * <p/>
+    * Possible values are the standard window states and any custom window states supported by the portal and the
+    * portlet. Standard window states are: <ul> <li>MINIMIZED <li>NORMAL <li>MAXIMIZED </ul>
     *
-    * @param windowState
-    *               the new portlet window state
-    *
-    * @exception WindowStateException
-    *                   if the portlet cannot switch to the specified window state.
-    *                   To avoid this exception the portlet can check the allowed
-    *                   window states with <code>Request.isWindowStateAllowed()</code>.
-    * @exception java.lang.IllegalStateException
-    *                    if the method is invoked after <code>sendRedirect</code> has been called.
-    *
+    * @param windowState the new portlet window state
+    * @throws WindowStateException if the portlet cannot switch to the specified window state. To avoid this exception
+    *                              the portlet can check the allowed window states with <code>Request.isWindowStateAllowed()</code>.
+    * @throws java.lang.IllegalStateException
+    *                              if the method is invoked after <code>sendRedirect</code> has been called.
     * @see WindowState
     */
    void setWindowState(WindowState windowState) throws WindowStateException;
 
    /**
     * Sets the portlet mode of a portlet to the given portlet mode.
-    * <p>
-    * Possible values are the standard portlet modes and any custom
-    * portlet modes supported by the portal and the portlet. Portlets
-    * must declare in the deployment descriptor the portlet modes they
-    * support for each markup type.
-    * Standard portlet modes are:
-    * <ul>
-    * <li>EDIT
-    * <li>HELP
-    * <li>VIEW
-    * </ul>
-    * <p>
-    * Note: The portlet may still be called in a different window
-    *       state in the next render call, depending on the portlet container / portal.
+    * <p/>
+    * Possible values are the standard portlet modes and any custom portlet modes supported by the portal and the
+    * portlet. Portlets must declare in the deployment descriptor the portlet modes they support for each markup type.
+    * Standard portlet modes are: <ul> <li>EDIT <li>HELP <li>VIEW </ul>
+    * <p/>
+    * Note: The portlet may still be called in a different window state in the next render call, depending on the
+    * portlet container / portal.
     *
-    * @param portletMode
-    *               the new portlet mode
-    *
-    * @exception PortletModeException
-    *                   if the portlet cannot switch to this portlet mode,
-    *                   because the portlet or portal does not support it for this markup,
-    *                   or the current user is not allowed to switch to this portlet mode.
-    *                   To avoid this exception the portlet can check the allowed
-    *                   portlet modes with <code>Request.isPortletModeAllowed()</code>.
-    * @exception java.lang.IllegalStateException
-    *                    if the method is invoked after <code>sendRedirect</code> has been called.
+    * @param portletMode the new portlet mode
+    * @throws PortletModeException if the portlet cannot switch to this portlet mode, because the portlet or portal does
+    *                              not support it for this markup, or the current user is not allowed to switch to this
+    *                              portlet mode. To avoid this exception the portlet can check the allowed portlet modes
+    *                              with <code>Request.isPortletModeAllowed()</code>.
+    * @throws java.lang.IllegalStateException
+    *                              if the method is invoked after <code>sendRedirect</code> has been called.
     */
    void setPortletMode(PortletMode portletMode) throws PortletModeException;
 
    /**
-    * Instructs the portlet container to send a redirect response
-    * to the client using the specified redirect location URL.
-    * <p>
-    * This method only accepts an absolute URL (e.g.
-    * <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
-    * or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>).
-    * If required,
-    * the portlet container may encode the given URL before the
-    * redirection is issued to the client.
-    * <p>
-    * The sendRedirect method can not be invoked after any of the
-    * following methods of the ActionResponse interface has been called:
-    * <ul>
-    * <li>setPortletMode
-    * <li>setWindowState
-    * <li>setRenderParameter
-    * <li>setRenderParameters
-    * </ul>
+    * Instructs the portlet container to send a redirect response to the client using the specified redirect location
+    * URL.
+    * <p/>
+    * This method only accepts an absolute URL (e.g. <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
+    * or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>). If required, the portlet
+    * container may encode the given URL before the redirection is issued to the client.
+    * <p/>
+    * The sendRedirect method can not be invoked after any of the following methods of the ActionResponse interface has
+    * been called: <ul> <li>setPortletMode <li>setWindowState <li>setRenderParameter <li>setRenderParameters </ul>
     *
-    * @param		location	the redirect location URL
-    *
-    * @exception	java.io.IOException
-    *                    if an input or output exception occurs.
-    * @exception	java.lang.IllegalArgumentException
-    *                    if a relative path URL is given
-    * @exception java.lang.IllegalStateException
-    *                    if the method is invoked after any of above mentioned methods of
-    *                    the ActionResponse interface has been called.
+    * @throws java.lang.IllegalStateException
+    *          if the method is invoked after any of above mentioned methods of the ActionResponse interface has been
+    *          called.
+    * @param      location   the redirect location URL
+    * @exception java.io.IOException if an input or output exception occurs.
+    * @exception java.lang.IllegalArgumentException if a relative path URL is given
     */
    void sendRedirect(String location) throws IOException, IllegalArgumentException, IllegalStateException;
 
    /**
     * Sets a parameter map for the render request.
-    * <p>
+    * <p/>
     * All previously set render parameters are cleared.
-    * <p>
-    * These parameters will be accessible in all
-    * sub-sequent render calls via the
-    * <code>PortletRequest.getParameter</code> call until
-    * a new request is targeted to the portlet.
-    * <p>
-    * The given parameters do not need to be encoded
-    * prior to calling this method.
+    * <p/>
+    * These parameters will be accessible in all sub-sequent render calls via the <code>PortletRequest.getParameter</code>
+    * call until a new request is targeted to the portlet.
+    * <p/>
+    * The given parameters do not need to be encoded prior to calling this method.
     *
-    * @param  parameters   Map containing parameter names for
-    *                      the render phase as
-    *                      keys and parameter values as map
-    *                      values. The keys in the parameter
-    *                      map must be of type String. The values
-    *                      in the parameter map must be of type
-    *                      String array (<code>String[]</code>).
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if parameters is <code>null</code>, if
-    *                      any of the key/values in the Map are <code>null</code>,
-    *                      if any of the keys is not a String, or if any of
-    *                      the values is not a String array.
-    * @exception java.lang.IllegalStateException
-    *                    if the method is invoked after <code>sendRedirect</code> has been called.
+    * @param parameters Map containing parameter names for the render phase as keys and parameter values as map values.
+    *                   The keys in the parameter map must be of type String. The values in the parameter map must be of
+    *                   type String array (<code>String[]</code>).
+    * @throws java.lang.IllegalStateException
+    *          if the method is invoked after <code>sendRedirect</code> has been called.
+    * @exception java.lang.IllegalArgumentException if parameters is <code>null</code>, if any of the key/values in the
+    * Map are <code>null</code>, if any of the keys is not a String, or if any of the values is not a String array.
     */
    void setRenderParameters(Map parameters) throws IllegalArgumentException, IllegalStateException;
 
    /**
     * Sets a String parameter for the render request.
-    * <p>
-    * These parameters will be accessible in all
-    * sub-sequent render calls via the
-    * <code>PortletRequest.getParameter</code> call until
-    * a request is targeted to the portlet.
-    * <p>
+    * <p/>
+    * These parameters will be accessible in all sub-sequent render calls via the <code>PortletRequest.getParameter</code>
+    * call until a request is targeted to the portlet.
+    * <p/>
     * This method replaces all parameters with the given key.
-    * <p>
-    * The given parameter do not need to be encoded
-    * prior to calling this method.
+    * <p/>
+    * The given parameter do not need to be encoded prior to calling this method.
     *
-    * @param  key    key of the render parameter
-    * @param  value  value of the render parameter
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if key or value are <code>null</code>.
-    * @exception java.lang.IllegalStateException
-    *                    if the method is invoked after <code>sendRedirect</code> has been called.
+    * @param key   key of the render parameter
+    * @param value value of the render parameter
+    * @throws java.lang.IllegalStateException
+    *          if the method is invoked after <code>sendRedirect</code> has been called.
+    * @exception java.lang.IllegalArgumentException if key or value are <code>null</code>.
     */
    void setRenderParameter(String key, String value) throws IllegalArgumentException, IllegalStateException;
 
    /**
     * Sets a String array parameter for the render request.
-    * <p>
-    * These parameters will be accessible in all
-    * sub-sequent render calls via the
-    * <code>PortletRequest.getParameter</code> call until
-    * a request is targeted to the portlet.
-    * <p>
+    * <p/>
+    * These parameters will be accessible in all sub-sequent render calls via the <code>PortletRequest.getParameter</code>
+    * call until a request is targeted to the portlet.
+    * <p/>
     * This method replaces all parameters with the given key.
-    * <p>
-    * The given parameter do not need to be encoded
-    * prior to calling this method.
+    * <p/>
+    * The given parameter do not need to be encoded prior to calling this method.
     *
-    * @param  key     key of the render parameter
-    * @param  values  values of the render parameter
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if key or value are <code>null</code>.
-    * @exception java.lang.IllegalStateException
-    *                    if the method is invoked after <code>sendRedirect</code> has been called.
+    * @param key    key of the render parameter
+    * @param values values of the render parameter
+    * @throws java.lang.IllegalStateException
+    *          if the method is invoked after <code>sendRedirect</code> has been called.
+    * @exception java.lang.IllegalArgumentException if key or value are <code>null</code>.
     */
    void setRenderParameter(String key, String[] values) throws IllegalArgumentException, IllegalStateException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/GenericPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/GenericPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/GenericPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.IOException;
@@ -27,32 +28,21 @@
 import java.util.ResourceBundle;
 
 /**
- * The <CODE>GenericPortlet</CODE> class provides a default implementation
- * for the <CODE>Portlet</CODE> interface.
- * <p>
- * It provides an abstract class to be subclassed to create portlets. A
- * subclass of <CODE>GenericPortlet</CODE> should override at least
- * one method, usually one of the following:
- * <ul>
- * <li>processAction, to handle action requests</li>
- * <li>doView, to handle render requests when in VIEW mode</li>
- * <li>doEdit, to handle render requests when in EDIT mode</li>
- * <li>doHelp, to handle render request when in HELP mode</li>
- * <li>init and destroy, to manage resources that are held for the life of
- * the servlet</li>
- * </ul>
- * <p>
- * Normally there is no need to override the render or the doDispatch
- * methods. Render handles render requests setting the title of the
- * portlet in the response and invoking doDispatch. doDispatch dispatches
- * the request to one of the doView, doEdit or doHelp method depending on
- * the portlet mode indicated in the request.
- * <p>
- * Portlets typically run on multithreaded servers, so please note that a
- * portlet must handle concurrent requests and be careful to synchronize
- * access to shared resources.  Shared resources include in-memory data
- * such as  instance or class variables and external objects  such as
- * files, database connections, and network  connections.
+ * The <CODE>GenericPortlet</CODE> class provides a default implementation for the <CODE>Portlet</CODE> interface.
+ * <p/>
+ * It provides an abstract class to be subclassed to create portlets. A subclass of <CODE>GenericPortlet</CODE> should
+ * override at least one method, usually one of the following: <ul> <li>processAction, to handle action requests</li>
+ * <li>doView, to handle render requests when in VIEW mode</li> <li>doEdit, to handle render requests when in EDIT
+ * mode</li> <li>doHelp, to handle render request when in HELP mode</li> <li>init and destroy, to manage resources that
+ * are held for the life of the servlet</li> </ul>
+ * <p/>
+ * Normally there is no need to override the render or the doDispatch methods. Render handles render requests setting
+ * the title of the portlet in the response and invoking doDispatch. doDispatch dispatches the request to one of the
+ * doView, doEdit or doHelp method depending on the portlet mode indicated in the request.
+ * <p/>
+ * Portlets typically run on multithreaded servers, so please note that a portlet must handle concurrent requests and be
+ * careful to synchronize access to shared resources.  Shared resources include in-memory data such as  instance or
+ * class variables and external objects  such as files, database connections, and network  connections.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -62,28 +52,20 @@
 
    private PortletConfig config;
 
-   /**
-    * Does nothing.
-    */
+   /** Does nothing. */
    protected GenericPortlet()
    {
    }
 
    /**
+    * A convenience method which can be overridden so that there's no need to call <code>super.init(config)</code>.
+    * <p/>
+    * <p>Instead of overriding {@link #init(PortletConfig)}, simply override this method and it will be called by
+    * <code>GenericPortlet.init(PortletConfig config)</code>. The <code>PortletConfig</code> object can still be
+    * retrieved via {@link #getPortletConfig}.
     *
-    * A convenience method which can be overridden so that there's no need
-    * to call <code>super.init(config)</code>.
-    *
-    * <p>Instead of overriding {@link #init(PortletConfig)}, simply override
-    * this method and it will be called by
-    * <code>GenericPortlet.init(PortletConfig config)</code>.
-    * The <code>PortletConfig</code> object can still be retrieved via {@link
-    * #getPortletConfig}.
-    *
-    * @exception PortletException 	if an exception has occurred that
-    *					interferes with the portlet normal
-    *					operation.
-    * @exception UnavailableException 	if the portlet is unavailable to perform init
+    * @throws PortletException     if an exception has occurred that interferes with the portlet normal operation.
+    * @throws UnavailableException if the portlet is unavailable to perform init
     */
    public void init() throws PortletException
    {
@@ -92,7 +74,7 @@
    /**
     * Returns the PortletConfig object of this portlet.
     *
-    * @return   the PortletConfig object of this portlet
+    * @return the PortletConfig object of this portlet
     */
    public PortletConfig getPortletConfig()
    {
@@ -103,7 +85,6 @@
     * Returns the name of this portlet.
     *
     * @return the portlet name
-    *
     * @see PortletConfig#getPortletName()
     */
    public String getPortletName()
@@ -112,10 +93,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()
    {
@@ -123,39 +103,25 @@
    }
 
    /**
-    * The default implementation of this method routes the render request
-    * to a set of helper methods depending on the current portlet mode the
-    * portlet is currently in.
-    * These methods are:
-    * <ul>
-    * <li><code>doView</code> for handling <code>view</code> requests
-    * <li><code>doEdit</code> for handling <code>edit</code> requests
-    * <li><code>doHelp</code> for handling <code>help</code> requests
-    * </ul>
-    * <P>
-    * If the window state of this portlet is <code>minimized</code>, this
-    * method does not invoke any of the portlet mode rendering methods.
-    * <p>
-    * For handling custom portlet modes the portlet should override this
-    * method.
+    * The default implementation of this method routes the render request to a set of helper methods depending on the
+    * current portlet mode the portlet is currently in. These methods are: <ul> <li><code>doView</code> for handling
+    * <code>view</code> requests <li><code>doEdit</code> for handling <code>edit</code> requests <li><code>doHelp</code>
+    * for handling <code>help</code> requests </ul>
+    * <p/>
+    * If the window state of this portlet is <code>minimized</code>, this method does not invoke any of the portlet mode
+    * rendering methods.
+    * <p/>
+    * For handling custom portlet modes the portlet should override this method.
     *
-    * @param request
-    *                 the render request
-    * @param response
-    *                 the render response
-    *
-    * @exception PortletException
-    *                   if the portlet cannot fulfilling the request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to perform render at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception java.io.IOException
-    *                   if the streaming causes an I/O problem
-    *
-    * @see #doView(RenderRequest, RenderResponse)
-    * @see #doEdit(RenderRequest, RenderResponse)
-    * @see #doHelp(RenderRequest, RenderResponse)
+    * @param request  the render request
+    * @param response the render response
+    * @throws PortletException         if the portlet cannot fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to perform render at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
+    * @see #doView(RenderRequest,RenderResponse)
+    * @see #doEdit(RenderRequest,RenderResponse)
+    * @see #doHelp(RenderRequest,RenderResponse)
     */
    protected void doDispatch(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
@@ -179,23 +145,15 @@
 
    /**
     * Helper method to serve up the mandatory <code>view</code> mode.
-    * <p>
+    * <p/>
     * The default implementation throws an exception.
     *
-    * @param    request
-    *           the portlet request
-    * @param    response
-    *           the render response
-    *
-    * @exception PortletException
-    *                   if the portlet cannot fulfilling the request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to perform render at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception java.io.IOException
-    *                   if the streaming causes an I/O problem
-    *
+    * @param request  the portlet request
+    * @param response the render response
+    * @throws PortletException         if the portlet cannot fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to perform render at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
     */
    protected void doView(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
@@ -204,22 +162,15 @@
 
    /**
     * Helper method to serve up the <code>help</code> mode.
-    * <p>
+    * <p/>
     * The default implementation throws an exception.
     *
-    * @param    request
-    *           the portlet request
-    * @param    response
-    *           the render response
-    *
-    * @exception PortletException
-    *                   if the portlet cannot fulfilling the request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to perform render at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception java.io.IOException
-    *                   if the streaming causes an I/O problem
+    * @param request  the portlet request
+    * @param response the render response
+    * @throws PortletException         if the portlet cannot fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to perform render at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
     */
    protected void doHelp(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
@@ -228,23 +179,15 @@
 
    /**
     * Helper method to serve up the <code>edit</code> mode.
-    * <p>
+    * <p/>
     * The default implementation throws an exception.
     *
-    * @param    request
-    *           the portlet request
-    * @param    response
-    *           the render response
-    *
-    * @exception PortletException
-    *                   if the portlet cannot fulfilling the request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to perform render at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception java.io.IOException
-    *                   if the streaming causes an I/O problem
-    *
+    * @param request  the portlet request
+    * @param response the render response
+    * @throws PortletException         if the portlet cannot fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to perform render at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
     */
    protected void doEdit(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
@@ -252,12 +195,10 @@
    }
 
    /**
-    * Gets the resource bundle for the given locale based on the
-    * resource bundle defined in the deployment descriptor
-    * with <code>resource-bundle</code> tag or the inlined resources
-    * defined in the deployment descriptor.
+    * Gets the resource bundle for the given locale based on the resource bundle defined in the deployment descriptor
+    * with <code>resource-bundle</code> tag or the inlined resources defined in the deployment descriptor.
     *
-    * @return   the resource bundle for the given locale
+    * @return the resource bundle for the given locale
     */
    public ResourceBundle getResourceBundle(Locale locale)
    {
@@ -266,19 +207,13 @@
 
    /**
     * Used by the render method to get the title.
-    * <p>
-    * The default implementation gets the title from the ResourceBundle
-    * of the PortletConfig of the portlet. The title is retrieved
-    * using the 'javax.portlet.title' resource name.
-    * <p>
-    * Portlets can overwrite this method to provide dynamic
-    * titles (e.g. based on locale, client, and session information).
-    * Examples are:
-    * <UL>
-    * <LI>language-dependant titles for multi-lingual portals
-    * <LI>shorter titles for WAP phones
-    * <LI>the number of messages in a mailbox portlet
-    * </UL>
+    * <p/>
+    * The default implementation gets the title from the ResourceBundle of the PortletConfig of the portlet. The title
+    * is retrieved using the 'javax.portlet.title' resource name.
+    * <p/>
+    * Portlets can overwrite this method to provide dynamic titles (e.g. based on locale, client, and session
+    * information). Examples are: <UL> <LI>language-dependant titles for multi-lingual portals <LI>shorter titles for
+    * WAP phones <LI>the number of messages in a mailbox portlet </UL>
     *
     * @return the portlet title for this window
     */
@@ -289,17 +224,12 @@
    }
 
    /**
-    * Returns a String containing the value of the named initialization parameter,
-    * or null if the parameter does not exist.
+    * Returns a String containing the value of the named initialization parameter, or null if the parameter does not
+    * exist.
     *
-    * @param name	a <code>String</code> specifying the name
-    *			of the initialization parameter
-    *
-    * @return		a <code>String</code> containing the value
-    *			of the initialization parameter
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the name of the initialization parameter
+    * @return a <code>String</code> containing the value of the initialization parameter
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
     */
    public String getInitParameter(String name) throws IllegalArgumentException
    {
@@ -307,14 +237,11 @@
    }
 
    /**
-    * Returns the names of the portlet initialization parameters as an
-    * Enumeration of String objects, or an empty Enumeration if the
-    * portlet has no initialization parameters.
+    * Returns the names of the portlet initialization parameters as an Enumeration of String objects, or an empty
+    * Enumeration if the portlet has no initialization parameters.
     *
-    * @return		an <code>Enumeration</code> of <code>String</code>
-    *			objects containing the names of the portlet
-    *			initialization parameters, or an empty Enumeration if the
-    *                    portlet has no initialization parameters.
+    * @return an <code>Enumeration</code> of <code>String</code> objects containing the names of the portlet
+    * initialization parameters, or an empty Enumeration if the portlet has no initialization parameters.
     */
    public Enumeration getInitParameterNames()
    {
@@ -322,32 +249,20 @@
    }
 
    /**
-    * Called by the portlet container to indicate to a portlet that the
-    * portlet is being placed into service.
-    * <p>
-    * The default implementation just stores the <code>PortletConfig</code>
-    * object.
-    * <p>The portlet container calls the <code>init</code>
-    * method exactly once after instantiating the portlet.
-    * The <code>init</code> method must complete successfully
-    * before the portlet can receive any requests.
+    * Called by the portlet container to indicate to a portlet that the portlet is being placed into service.
+    * <p/>
+    * The default implementation just stores the <code>PortletConfig</code> object. <p>The portlet container calls the
+    * <code>init</code> method exactly once after instantiating the portlet. The <code>init</code> method must complete
+    * successfully before the portlet can receive any requests.
+    * <p/>
+    * <p>The portlet container cannot place the portlet into service if the <code>init</code> method does one of the
+    * following: <ol> <li>it throws a <code>PortletException</code> <li>it does not return within a time period defined
+    * by the Web server </ol>
     *
-    * <p>The portlet container cannot place the portlet into service
-    * if the <code>init</code> method does one of the following:
-    * <ol>
-    * <li>it throws a <code>PortletException</code>
-    * <li>it does not return within a time period defined by the Web server
-    * </ol>
-    *
-    *
-    * @param config			a <code>PortletConfig</code> object
-    *					containing the portlet
-    * 					configuration and initialization parameters
-    *
-    * @exception PortletException 	if an exception has occurred that
-    *					interferes with the portlet normal
-    *					operation.
-    * @exception UnavailableException 	if the portlet cannot perform the initialization at this time.
+    * @param config a <code>PortletConfig</code> object containing the portlet configuration and initialization
+    *               parameters
+    * @throws PortletException     if an exception has occurred that interferes with the portlet normal operation.
+    * @throws UnavailableException if the portlet cannot perform the initialization at this time.
     */
    public void init(PortletConfig config) throws PortletException
    {
@@ -356,25 +271,18 @@
    }
 
    /**
-    * Called by the portlet container to allow the portlet to process
-    * an action request. This method is called if the client request was
-    * originated by a URL created (by the portlet) with the
-    * <code>RenderResponse.createActionURL()</code> method.
-    * <p>
+    * Called by the portlet container to allow the portlet to process an action request. This method is called if the
+    * client request was originated by a URL created (by the portlet) with the <code>RenderResponse.createActionURL()</code>
+    * method.
+    * <p/>
     * The default implementation throws an exception.
     *
-    * @param request
-    *                 the action request
-    * @param response
-    *                 the action response
-    * @exception PortletException
-    *                   if the portlet cannot fulfilling the request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to process the action at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception  java.io.IOException
-    *                   if the streaming causes an I/O problem
+    * @param request  the action request
+    * @param response the action response
+    * @throws PortletException         if the portlet cannot fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to process the action at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
     */
    public void processAction(ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException
    {
@@ -382,24 +290,15 @@
    }
 
    /**
-    * The default implementation of this method sets the title
-    * using the <code>getTitle</code> method and invokes the
+    * The default implementation of this method sets the title using the <code>getTitle</code> method and invokes the
     * <code>doDispatch</code> method.
     *
-    * @param request
-    *                 the render request
-    * @param response
-    *                 the render response
-    *
-    * @exception PortletException
-    *                   if the portlet cannot fulfilling the request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to perform render at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception java.io.IOException
-    *                   if the streaming causes an I/O problem
-    *
+    * @param request  the render request
+    * @param response the render response
+    * @throws PortletException         if the portlet cannot fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to perform render at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
     */
    public void render(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
@@ -408,11 +307,9 @@
    }
 
    /**
-    * Called by the portlet container to indicate to a portlet that the portlet
-    * is being taken out of service.
-    * <p>
+    * Called by the portlet container to indicate to a portlet that the portlet is being taken out of service.
+    * <p/>
     * The default implementation does nothing.
-    *
     */
    public void destroy()
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortalContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortalContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortalContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 import java.util.Enumeration;
 
 /**
- * The <CODE>PortalContext</CODE> interface gives the portlet
- * the ability to retrieve information about the portal calling this portlet.
- * <p>
+ * The <CODE>PortalContext</CODE> interface gives the portlet the ability to retrieve information about the portal
+ * calling this portlet.
+ * <p/>
  * The portlet can only read the <CODE>PortalContext</CODE> data.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -36,63 +37,48 @@
 {
    /**
     * Returns information about the portal like vendor, version, etc.
-    * <p>
-    * The form of the returned string is <I>servername/versionnumber</I>. For
-    * example, the reference implementation Pluto may return the string
-    * <CODE>Pluto/1.0</CODE>.
-    * <p>
-    * The portlet container may return other optional information  after the
-    * primary string in parentheses, for example, <CODE>Pluto/1.0
-    * (JDK 1.3.1; Windows NT 4.0 x86)</CODE>.
+    * <p/>
+    * The form of the returned string is <I>servername/versionnumber</I>. For example, the reference implementation
+    * Pluto may return the string <CODE>Pluto/1.0</CODE>.
+    * <p/>
+    * The portlet container may return other optional information  after the primary string in parentheses, for example,
+    * <CODE>Pluto/1.0 (JDK 1.3.1; Windows NT 4.0 x86)</CODE>.
     *
     * @return a <CODE>String</CODE> containing at least the portal name and version number
     */
    String getPortalInfo();
 
    /**
-    * Returns the portal property with the given name,
-    * or a <code>null</code> if there is
-    * no property by that name.
+    * Returns the portal property with the given name, or a <code>null</code> if there is no property by that name.
     *
-    * @param  name    property name
-    *
-    * @return  portal property with key <code>name</code>
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @param name property name
+    * @return portal property with key <code>name</code>
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
     */
    String getProperty(String name);
 
    /**
-    * Returns all portal property names, or an empty
-    * <code>Enumeration</code> if there are no property names.
+    * Returns all portal property names, or an empty <code>Enumeration</code> if there are no property names.
     *
-    * @return  All portal property names as an
-    *          <code>Enumeration</code> of <code>String</code> objects
+    * @return All portal property names as an <code>Enumeration</code> of <code>String</code> objects
     */
    Enumeration getPropertyNames();
 
    /**
-    * Returns all supported portlet modes by the portal
-    * as an enumertation of <code>PorltetMode</code> objects.
-    * <p>
-    * The portlet modes must at least include the
-    * standard portlet modes <code>EDIT, HELP, VIEW</code>.
+    * Returns all supported portlet modes by the portal as an enumertation of <code>PorltetMode</code> objects.
+    * <p/>
+    * The portlet modes must at least include the standard portlet modes <code>EDIT, HELP, VIEW</code>.
     *
-    * @return  All supported portal modes by the portal
-    *          as an enumertation of <code>PorltetMode</code> objects.
+    * @return All supported portal modes by the portal as an enumertation of <code>PorltetMode</code> objects.
     */
    Enumeration getSupportedPortletModes();
 
    /**
-    * Returns all supported window states by the portal
-    * as an enumertation of <code>WindowState</code> objects.
-    * <p>
-    * The window states must at least include the
-    * standard window states <code> MINIMIZED, NORMAL, MAXIMIZED</code>.
+    * Returns all supported window states by the portal as an enumertation of <code>WindowState</code> objects.
+    * <p/>
+    * The window states must at least include the standard window states <code> MINIMIZED, NORMAL, MAXIMIZED</code>.
     *
-    * @return  All supported window states by the portal
-    *          as an enumertation of <code>WindowState</code> objects.
+    * @return All supported window states by the portal as an enumertation of <code>WindowState</code> objects.
     */
    Enumeration getSupportedWindowStates();
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/Portlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/Portlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/Portlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,58 +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 javax.portlet;
 
 import java.io.IOException;
 
 /**
- * The <CODE>Portlet</CODE> interface is used by the portlet container to
- * invoke the portlets. Every portlet has to implement this interface,
- * either by directly implementing it, or by using an existing class
- * implementing the Portlet interface.
- * <P>
- * A portlet is a Java technology-based web component. It is managed by the portlet container and
- * processes requests and generates dynamic content as response. Portlets are used by portals as
- * pluggable user interface components.
- * <p>
- * The content generated by a portlet is called a fragment. A fragment is a piece of
- * markup (e.g. HTML, XHTML, WML) adhering to certain rules and can be aggregated
- * with other fragments into a complete document. The content of a portlet is normally
- * aggregated with the content of other portlets into the portal page.
- * <P>
- * The portlet container instanciates portlets, manages their lifecycle
- * and invoking them to process requests. The lifecycle consists of:
- * <ul>
- * <li>initializing the portlet using using the <code>init</code> method
- * <li>request processsing
- * <li>taking the portlet out of service using the <code>destroy</code> method
- * </ul>
- * <p>
- * Request processing is divided into two types:
- * <ul>
- * <li>action requests handled through the <code>processAction</code> method,
- *     to perform actions targeted to the portlet
- * <li>render requests handled through the <code>render</code> method,
- *     to perform the render operation
- * </ul>
+ * The <CODE>Portlet</CODE> interface is used by the portlet container to invoke the portlets. Every portlet has to
+ * implement this interface, either by directly implementing it, or by using an existing class implementing the Portlet
+ * interface.
+ * <p/>
+ * A portlet is a Java technology-based web component. It is managed by the portlet container and processes requests and
+ * generates dynamic content as response. Portlets are used by portals as pluggable user interface components.
+ * <p/>
+ * The content generated by a portlet is called a fragment. A fragment is a piece of markup (e.g. HTML, XHTML, WML)
+ * adhering to certain rules and can be aggregated with other fragments into a complete document. The content of a
+ * portlet is normally aggregated with the content of other portlets into the portal page.
+ * <p/>
+ * The portlet container instanciates portlets, manages their lifecycle and invoking them to process requests. The
+ * lifecycle consists of: <ul> <li>initializing the portlet using using the <code>init</code> method <li>request
+ * processsing <li>taking the portlet out of service using the <code>destroy</code> method </ul>
+ * <p/>
+ * Request processing is divided into two types: <ul> <li>action requests handled through the <code>processAction</code>
+ * method, to perform actions targeted to the portlet <li>render requests handled through the <code>render</code>
+ * method, to perform the render operation </ul>
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -60,112 +50,65 @@
 public interface Portlet
 {
    /**
-    * Called by the portlet container to indicate to a portlet that the
-    * portlet is being placed into service.
+    * Called by the portlet container to indicate to a portlet that the portlet is being placed into service.
+    * <p/>
+    * <p>The portlet container calls the <code>init</code> method exactly once after instantiating the portlet. The
+    * <code>init</code> method must complete successfully before the portlet can receive any requests.
+    * <p/>
+    * <p>The portlet container cannot place the portlet into service if the <code>init</code> method <ol> <li>Throws a
+    * <code>PortletException</code> <li>Does not return within a time period defined by the portlet container. </ol>
     *
-    * <p>The portlet container calls the <code>init</code>
-    * method exactly once after instantiating the portlet.
-    * The <code>init</code> method must complete successfully
-    * before the portlet can receive any requests.
-    *
-    * <p>The portlet container cannot place the portlet into service
-    * if the <code>init</code> method
-    * <ol>
-    * <li>Throws a <code>PortletException</code>
-    * <li>Does not return within a time period defined by the portlet container.
-    * </ol>
-    *
-    *
-    * @param config			a <code>PortletConfig</code> object
-    *					containing the portlet's
-    * 					configuration and initialization parameters
-    *
-    * @exception PortletException 	if an exception has occurred that
-    *					interferes with the portlet's normal
-    *					operation.
-    * @exception UnavailableException 	if the portlet cannot perform the initialization at this time.
-    *
-    *
+    * @param config a <code>PortletConfig</code> object containing the portlet's configuration and initialization
+    *               parameters
+    * @throws PortletException     if an exception has occurred that interferes with the portlet's normal operation.
+    * @throws UnavailableException if the portlet cannot perform the initialization at this time.
     */
    void init(PortletConfig config) throws PortletException;
 
    /**
-    * Called by the portlet container to allow the portlet to process
-    * an action request. This method is called if the client request was
-    * originated by a URL created (by the portlet) with the
-    * <code>RenderResponse.createActionURL()</code> method.
-    * <p>
-    * Typically, in response to an action request, a portlet updates state
-    * based on the information sent in the action request parameters.
-    * In an action the portlet may:
-    * <ul>
-    * <li>issue a redirect
-    * <li>change its window state
-    * <li>change its portlet mode
-    * <li>modify its persistent state
-    * <li>set render parameters
-    * </ul>
-    * <p>
-    * A client request triggered by an action URL translates into one
-    * action request and many render requests, one per portlet in the portal page.
-    * The action processing must be finished before the render requests
-    * can be issued.
+    * Called by the portlet container to allow the portlet to process an action request. This method is called if the
+    * client request was originated by a URL created (by the portlet) with the <code>RenderResponse.createActionURL()</code>
+    * method.
+    * <p/>
+    * Typically, in response to an action request, a portlet updates state based on the information sent in the action
+    * request parameters. In an action the portlet may: <ul> <li>issue a redirect <li>change its window state <li>change
+    * its portlet mode <li>modify its persistent state <li>set render parameters </ul>
+    * <p/>
+    * A client request triggered by an action URL translates into one action request and many render requests, one per
+    * portlet in the portal page. The action processing must be finished before the render requests can be issued.
     *
-    * @param request
-    *                 the action request
-    * @param response
-    *                 the action response
-    * @exception  PortletException
-    *                   if the portlet has problems fulfilling the
-    *                   request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to process the action at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception  IOException
-    *                   if the streaming causes an I/O problem
+    * @param request  the action request
+    * @param response the action response
+    * @throws PortletException         if the portlet has problems fulfilling the request
+    * @throws UnavailableException     if the portlet is unavailable to process the action at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws IOException              if the streaming causes an I/O problem
     */
    void processAction(ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException;
 
    /**
-    * Called by the portlet container to allow the portlet to generate
-    * the content of the response based on its current state.
+    * Called by the portlet container to allow the portlet to generate the content of the response based on its current
+    * state.
     *
-    * @param   request
-    *          the render request
-    * @param   response
-    *          the render response
-    *
-    * @exception   PortletException
-    *              if the portlet has problems fulfilling the
-    *              rendering request
-    * @exception  UnavailableException
-    *                   if the portlet is unavailable to perform render at this time
-    * @exception  PortletSecurityException
-    *                   if the portlet cannot fullfill this request because of security reasons
-    * @exception  java.io.IOException
-    *              if the streaming causes an I/O problem
+    * @param request  the render request
+    * @param response the render response
+    * @throws PortletException         if the portlet has problems fulfilling the rendering request
+    * @throws UnavailableException     if the portlet is unavailable to perform render at this time
+    * @throws PortletSecurityException if the portlet cannot fullfill this request because of security reasons
+    * @throws java.io.IOException      if the streaming causes an I/O problem
     */
    void render(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException;
 
    /**
-    *
-    * Called by the portlet container to indicate to a portlet that the
-    * portlet is being taken out of service.
-    * <p>
-    * Before the portlet container calls the destroy method, it should
-    * allow any threads that are currently processing requests within
-    * the portlet object to complete execution. To avoid
-    * waiting forever, the portlet container can optionally wait for
-    * a predefined time before destroying the portlet object.
-    *
-    * <p>This method enables the portlet to do the following:
-    * <ul>
-    * <li>clean up any resources that it holds (for example, memory,
-    * file handles, threads)
-    * <li>make sure that any persistent state is
-    * synchronized with the portlet current state in memory.
-    * </ul>
+    * Called by the portlet container to indicate to a portlet that the portlet is being taken out of service.
+    * <p/>
+    * Before the portlet container calls the destroy method, it should allow any threads that are currently processing
+    * requests within the portlet object to complete execution. To avoid waiting forever, the portlet container can
+    * optionally wait for a predefined time before destroying the portlet object.
+    * <p/>
+    * <p>This method enables the portlet to do the following: <ul> <li>clean up any resources that it holds (for
+    * example, memory, file handles, threads) <li>make sure that any persistent state is synchronized with the portlet
+    * current state in memory. </ul>
     */
    void destroy();
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletConfig.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletConfig.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletConfig.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.util.Enumeration;
@@ -26,81 +27,62 @@
 import java.util.ResourceBundle;
 
 /**
- * The <CODE>PortletConfig</CODE> interface provides the portlet with
- * its configuration. The configuration holds information about the
- * portlet that is valid for all users. The configuration is retrieved
- * from the portlet definition in the deployment descriptor.
- * The portlet can only read the configuration data.
- * <p>
- * The configuration information contains the portlet name, the portlet
- * initialization parameters, the portlet resource bundle and the portlet
- * application context.
+ * The <CODE>PortletConfig</CODE> interface provides the portlet with its configuration. The configuration holds
+ * information about the portlet that is valid for all users. The configuration is retrieved from the portlet definition
+ * in the deployment descriptor. The portlet can only read the configuration data.
+ * <p/>
+ * The configuration information contains the portlet name, the portlet initialization parameters, the portlet resource
+ * bundle and the portlet application context.
  *
- * @see Portlet
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see Portlet
  */
 public interface PortletConfig
 {
    /**
     * Returns the name of the portlet.
-    * <P>
-    * The name may be provided via server administration, assigned in the
-    * portlet application deployment descriptor with the <code>portlet-name</code>
-    * tag.
+    * <p/>
+    * The name may be provided via server administration, assigned in the portlet application deployment descriptor with
+    * the <code>portlet-name</code> tag.
     *
-    * @return   the portlet name
+    * @return the portlet name
     */
    String getPortletName();
 
    /**
-    * 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   a <code>PortletContext</code> object, used by the
-    *           caller to interact with its portlet container
-    *
+    * @return a <code>PortletContext</code> object, used by the caller to interact with its portlet container
     * @see PortletContext
     */
    PortletContext getPortletContext();
 
    /**
-    * Gets the resource bundle for the given locale based on the
-    * resource bundle defined in the deployment descriptor
-    * with <code>resource-bundle</code> tag or the inlined resources
-    * defined in the deployment descriptor.
+    * Gets the resource bundle for the given locale based on the resource bundle defined in the deployment descriptor
+    * with <code>resource-bundle</code> tag or the inlined resources defined in the deployment descriptor.
     *
-    * @param    locale    the locale for which to retrieve the resource bundle
-    *
-    * @return   the resource bundle for the given locale
-    *
+    * @param locale the locale for which to retrieve the resource bundle
+    * @return the resource bundle for the given locale
     */
    ResourceBundle getResourceBundle(Locale locale);
 
    /**
-    * Returns a String containing the value of the named initialization parameter,
-    * or null if the parameter does not exist.
+    * Returns a String containing the value of the named initialization parameter, or null if the parameter does not
+    * exist.
     *
-    * @param name	a <code>String</code> specifying the name
-    *			of the initialization parameter
-    *
-    * @return		a <code>String</code> containing the value
-    *			of the initialization parameter
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the name of the initialization parameter
+    * @return a <code>String</code> containing the value of the initialization parameter
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
     */
    String getInitParameter(String name) throws IllegalArgumentException;
 
    /**
-    * Returns the names of the portlet initialization parameters as an
-    * <code>Enumeration</code> of String objects, or an empty <code>Enumeration</code> if the
-    * portlet has no initialization parameters.
+    * Returns the names of the portlet initialization parameters as an <code>Enumeration</code> of String objects, or an
+    * empty <code>Enumeration</code> if the portlet has no initialization parameters.
     *
-    * @return		an <code>Enumeration</code> of <code>String</code>
-    *			objects containing the names of the portlet
-    *			initialization parameters, or an empty <code>Enumeration</code> if the
-    *                    portlet has no initialization parameters.
+    * @return an <code>Enumeration</code> of <code>String</code> objects containing the names of the portlet
+    * initialization parameters, or an empty <code>Enumeration</code> if the portlet has no initialization parameters.
     */
    Enumeration getInitParameterNames();
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.InputStream;
@@ -28,393 +29,272 @@
 import java.util.Set;
 
 /**
- * The <CODE>PortletContext</CODE> interface defines a portlet view
- * of the portlet container.
- * The <CODE>PortletContext</CODE> also makes resources available
- * to the portlet. Using the context, a portlet can access
+ * The <CODE>PortletContext</CODE> interface defines a portlet view of the portlet container. The
+ * <CODE>PortletContext</CODE> also makes resources available to the portlet. Using the context, a portlet can access
  * the portlet log, and obtain URL references to resources.
+ * <p/>
+ * <p>There is one context per "portlet application" per Java Virtual Machine.  (A "portlet application" is a collection
+ * of portlets, servlets, and content installed under a specific subset of the server URL namespace, such as
+ * <code>/catalog</code>. They are possibly installed via a <code>.war</code> file.) As a web application, a portlet
+ * application also has a servlet context. The portlet context leverages most of its functionality from the servlet
+ * context of the portlet application.
+ * <p/>
+ * Attibutes stored in the context are global for <I>all</I> users and <I>all</I> components in the portlet
+ * application.
+ * <p/>
+ * In the case of a web application marked "distributed" in its deployment descriptor, there will be one context
+ * instance for each virtual machine.  In this situation, the context cannot be used as a location to share global
+ * information (because the information is not truly global). Use an external resource, such as a database to achieve
+ * sharing on a global scope.
  *
- * <p>There is one context per "portlet application" per Java Virtual Machine.  (A
- * "portlet application" is a collection of portlets, servlets, and content installed
- * under a specific subset of the server URL namespace, such as <code>/catalog</code>.
- * They are possibly installed via a <code>.war</code> file.)
- * As a web application, a portlet application also has a servlet context.
- * The portlet context leverages most of its functionality from the
- * servlet context of the portlet application.
- * <p>
- * Attibutes stored in the context are global for <I>all</I> users and <I>all</I>
- * components in the portlet application.
- * <p>
- * In the case of a web
- * application marked "distributed" in its deployment descriptor, there will
- * be one context instance for each virtual machine.  In this situation, the
- * context cannot be used as a location to share global information (because
- * the information is not truly global). Use an external resource, such as
- * a database to achieve sharing on a global scope.
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
 public interface PortletContext
 {
    /**
-    * Returns the name and version of the portlet container in which the
-    * portlet is running.
-    *
-    * <P>
+    * Returns the name and version of the portlet container in which the portlet is running.
+    * <p/>
+    * <p/>
     * The form of the returned string is <code>containername/versionnumber</code>.
     *
-    *
-    * @return   the string containing at least name and version number
+    * @return the string containing at least name and version number
     */
    String getServerInfo();
 
    /**
-    * Returns a {@link PortletRequestDispatcher} object that acts
-    * as a wrapper for the resource located at the given path.
-    * A <code>PortletRequestDispatcher</code> object can be used include the
-    * resource in a response. The resource can be dynamic or static.
+    * Returns a {@link PortletRequestDispatcher} object that acts as a wrapper for the resource located at the given
+    * path. A <code>PortletRequestDispatcher</code> object can be used include the resource in a response. The resource
+    * can be dynamic or static.
+    * <p/>
+    * <p>The pathname must begin with a slash (<code> / </code>) and is interpreted as relative to the current context
+    * root.
+    * <p/>
+    * <p>This method returns <code>null</code> if the <code>PortletContext</code> cannot return a
+    * <code>PortletRequestDispatcher</code> for any reason.
     *
-    * <p>The pathname must begin with a slash (<code> / </code>) and is interpreted as relative
-    * to the current context root.
-    *
-    * <p>This method returns <code>null</code> if the <code>PortletContext</code>
-    * cannot return a <code>PortletRequestDispatcher</code>
-    * for any reason.
-    *
-    *
-    * @param path   a <code>String</code> specifying the pathname
-    *               to the resource
-    * @return a <code>PortletRequestDispatcher</code> object
-    *         that acts as a wrapper for the resource
-    *         at the specified path.
+    * @param path a <code>String</code> specifying the pathname to the resource
+    * @return a <code>PortletRequestDispatcher</code> object that acts as a wrapper for the resource at the specified
+    *         path.
     * @see PortletRequestDispatcher
     */
 
    PortletRequestDispatcher getRequestDispatcher(String path);
 
    /**
-    * Returns a {@link PortletRequestDispatcher} object that acts
-    * as a wrapper for the named servlet.
-    *
-    * <p>Servlets (and also JSP pages) may be given names via server
-    * administration or via a web application deployment descriptor.
-    *
-    * <p>This method returns <code>null</code> if the
-    * <code>PortletContext</code> cannot return a
+    * Returns a {@link PortletRequestDispatcher} object that acts as a wrapper for the named servlet.
+    * <p/>
+    * <p>Servlets (and also JSP pages) may be given names via server administration or via a web application deployment
+    * descriptor.
+    * <p/>
+    * <p>This method returns <code>null</code> if the <code>PortletContext</code> cannot return a
     * <code>PortletRequestDispatcher</code> for any reason.
     *
-    *
-    * @param name 	a <code>String</code> specifying the name
-    *			of a servlet to be wrapped
-    *
-    * @return 		a <code>PortletRequestDispatcher</code> object
-    *			that acts as a wrapper for the named servlet
-    *
-    * @see 		PortletRequestDispatcher
-    *
+    * @param name a <code>String</code> specifying the name of a servlet to be wrapped
+    * @return a <code>PortletRequestDispatcher</code> object that acts as a wrapper for the named servlet
+    * @see PortletRequestDispatcher
     */
    PortletRequestDispatcher getNamedDispatcher(String name);
 
    /**
-    * Returns the resource located at the given path as an InputStream object.
-    * The data in the InputStream can be of any type or length. The method returns
-    * null if no resource exists at the given path.
-    * <p>
-    * In order to access protected resources the path has to be prefixed with
-    * <code>/WEB-INF/</code> (for example <code>/WEB-INF/myportlet/myportlet.jsp</code>).
-    * Otherwise, the direct path is used
-    * (for example <code>/myportlet/myportlet.jsp</code>).
+    * Returns the resource located at the given path as an InputStream object. The data in the InputStream can be of any
+    * type or length. The method returns null if no resource exists at the given path.
+    * <p/>
+    * In order to access protected resources the path has to be prefixed with <code>/WEB-INF/</code> (for example
+    * <code>/WEB-INF/myportlet/myportlet.jsp</code>). Otherwise, the direct path is used (for example
+    * <code>/myportlet/myportlet.jsp</code>).
     *
-    * @param path     the path to the resource
-    *
-    * @return    the input stream
+    * @param path the path to the resource
+    * @return the input stream
     */
    InputStream getResourceAsStream(String path);
 
    /**
-    * Returns the major version of the Portlet API that this portlet
-    * container supports.
+    * Returns the major version of the Portlet API that this portlet container supports.
     *
-    * @return   the major version
-    *
-    * @see   #getMinorVersion()
+    * @return the major version
+    * @see #getMinorVersion()
     */
    int getMajorVersion();
 
    /**
-    * Returns the minor version of the Portlet API that this portlet
-    * container supports.
+    * Returns the minor version of the Portlet API that this portlet container supports.
     *
-    * @return   the minor version
-    *
-    * @see   #getMajorVersion()
+    * @return the minor version
+    * @see #getMajorVersion()
     */
    int getMinorVersion();
 
    /**
-    * Returns the MIME type of the specified file, or <code>null</code> if
-    * the MIME type is not known. The MIME type is determined
-    * by the configuration of the portlet container and may be specified
-    * in a web application deployment descriptor. Common MIME
-    * types are <code>text/html</code> and <code>image/gif</code>.
+    * Returns the MIME type of the specified file, or <code>null</code> if the MIME type is not known. The MIME type is
+    * determined by the configuration of the portlet container and may be specified in a web application deployment
+    * descriptor. Common MIME types are <code>text/html</code> and <code>image/gif</code>.
     *
-    *
-    * @param   file    a <code>String</code> specifying the name
-    *			of a file
-    *
-    * @return 		a <code>String</code> specifying the MIME type of the file
-    *
+    * @param file a <code>String</code> specifying the name of a file
+    * @return a <code>String</code> specifying the MIME type of the file
     */
    String getMimeType(String file);
 
    /**
-    * Returns a <code>String</code> containing the real path
-    * for a given virtual path. For example, the path <code>/index.html</code>
-    * returns the absolute file path of the portlet container file system.
+    * Returns a <code>String</code> containing the real path for a given virtual path. For example, the path
+    * <code>/index.html</code> returns the absolute file path of the portlet container file system.
+    * <p/>
+    * <p>The real path returned will be in a form appropriate to the computer and operating system on which the portlet
+    * container is running, including the proper path separators. This method returns <code>null</code> if the portlet
+    * container cannot translate the virtual path to a real path for any reason (such as when the content is being made
+    * available from a <code>.war</code> archive).
     *
-    * <p>The real path returned will be in a form
-    * appropriate to the computer and operating system on
-    * which the portlet container is running, including the
-    * proper path separators. This method returns <code>null</code>
-    * if the portlet container cannot translate the virtual path
-    * to a real path for any reason (such as when the content is
-    * being made available from a <code>.war</code> archive).
-    *
-    * @param path 	a <code>String</code> specifying a virtual path
-    *
-    * @return 		a <code>String</code> specifying the real path,
-    *                    or null if the transformation cannot be performed.
+    * @param path a <code>String</code> specifying a virtual path
+    * @return a <code>String</code> specifying the real path, or null if the transformation cannot be performed.
     */
    String getRealPath(String path);
 
    /**
-    * Returns a directory-like listing of all the paths to resources within
-    * the web application longest sub-path of which
-    * matches the supplied path argument. Paths indicating subdirectory paths
-    * end with a slash (<code>/</code>). The returned paths are all
-    * relative to the root of the web application and have a leading slash.
-    * For example, for a web application
-    * containing<br><br>
-    * <code>
-    * /welcome.html<br>
-    * /catalog/index.html<br>
-    * /catalog/products.html<br>
-    * /catalog/offers/books.html<br>
-    * /catalog/offers/music.html<br>
-    * /customer/login.jsp<br>
-    * /WEB-INF/web.xml<br>
-    * /WEB-INF/classes/com.acme.OrderPortlet.class,<br><br>
-    * </code>
+    * Returns a directory-like listing of all the paths to resources within the web application longest sub-path of
+    * which matches the supplied path argument. Paths indicating subdirectory paths end with a slash (<code>/</code>).
+    * The returned paths are all relative to the root of the web application and have a leading slash. For example, for
+    * a web application containing<br><br> <code> /welcome.html<br> /catalog/index.html<br> /catalog/products.html<br>
+    * /catalog/offers/books.html<br> /catalog/offers/music.html<br> /customer/login.jsp<br> /WEB-INF/web.xml<br>
+    * /WEB-INF/classes/com.acme.OrderPortlet.class,<br><br> </code>
+    * <p/>
+    * <code>getResourcePaths("/")</code> returns <code>{"/welcome.html", "/catalog/", "/customer/",
+    * "/WEB-INF/"}</code><br> <code>getResourcePaths("/catalog/")</code> returns <code>{"/catalog/index.html",
+    * "/catalog/products.html", "/catalog/offers/"}</code>.<br>
     *
-    * <code>getResourcePaths("/")</code> returns
-    * <code>{"/welcome.html", "/catalog/", "/customer/", "/WEB-INF/"}</code><br>
-    * <code>getResourcePaths("/catalog/")</code> returns
-    * <code>{"/catalog/index.html", "/catalog/products.html", "/catalog/offers/"}</code>.<br>
-    *
-    * @param     path
-    *              the partial path used to match the resources, which must start with a slash
-    * @return     a Set containing the directory listing, or <code>null</code> if there
-    *             are no resources in the web application of which the path
-    *             begins with the supplied path.
+    * @param path the partial path used to match the resources, which must start with a slash
+    * @return a Set containing the directory listing, or <code>null</code> if there are no resources in the web
+    *         application of which the path begins with the supplied path.
     */
    Set getResourcePaths(String path);
 
    /**
-    * Returns a URL to the resource that is mapped to a specified
-    * path. The path must begin with a slash (<code>/</code>) and is interpreted
-    * as relative to the current context root.
-    *
-    * <p>This method allows the portlet container to make a resource
-    * available to portlets from any source. Resources
-    * can be located on a local or remote
-    * file system, in a database, or in a <code>.war</code> file.
-    *
-    * <p>The portlet container must implement the URL handlers
-    * and <code>URLConnection</code> objects that are necessary
+    * Returns a URL to the resource that is mapped to a specified path. The path must begin with a slash
+    * (<code>/</code>) and is interpreted as relative to the current context root.
+    * <p/>
+    * <p>This method allows the portlet container to make a resource available to portlets from any source. Resources
+    * can be located on a local or remote file system, in a database, or in a <code>.war</code> file.
+    * <p/>
+    * <p>The portlet container must implement the URL handlers and <code>URLConnection</code> objects that are necessary
     * to access the resource.
+    * <p/>
+    * <p>This method returns <code>null</code> if no resource is mapped to the pathname.
+    * <p/>
+    * <p>Some containers may allow writing to the URL returned by this method using the methods of the URL class.
+    * <p/>
+    * <p>The resource content is returned directly, so be aware that requesting a <code>.jsp</code> page returns the JSP
+    * source code. Use a <code>RequestDispatcher</code> instead to include results of an execution.
+    * <p/>
+    * <p>This method has a different purpose than <code>java.lang.Class.getResource</code>, which looks up resources
+    * based on a class loader. This method does not use class loaders.
     *
-    * <p>This method returns <code>null</code>
-    * if no resource is mapped to the pathname.
-    *
-    * <p>Some containers may allow writing to the URL returned by
-    * this method using the methods of the URL class.
-    *
-    * <p>The resource content is returned directly, so be aware that
-    * requesting a <code>.jsp</code> page returns the JSP source code.
-    * Use a <code>RequestDispatcher</code> instead to include results of
-    * an execution.
-    *
-    * <p>This method has a different purpose than
-    * <code>java.lang.Class.getResource</code>,
-    * which looks up resources based on a class loader. This
-    * method does not use class loaders.
-    *
-    * @param path 				a <code>String</code> specifying
-    *						the path to the resource
-    *
-    * @return 					the resource located at the named path,
-    * 						or <code>null</code> if there is no resource
-    *						at that path
-    *
-    * @exception MalformedURLException 	        if the pathname is not given in
-    * 						the correct form
-    *
+    * @param path a <code>String</code> specifying the path to the resource
+    * @return the resource located at the named path, or <code>null</code> if there is no resource at that path
+    * @throws MalformedURLException if the pathname is not given in the correct form
     */
    URL getResource(String path) throws MalformedURLException;
 
    /**
-    * Returns the portlet container attribute with the given name,
-    * or null if there is no attribute by that name.
-    * An attribute allows a portlet container to give the
-    * portlet additional information not
-    * already provided by this interface.
-    * A list of supported attributes can be retrieved using
-    * <code>getAttributeNames</code>.
+    * Returns the portlet container attribute with the given name, or null if there is no attribute by that name. An
+    * attribute allows a portlet container to give the portlet additional information not already provided by this
+    * interface. A list of supported attributes can be retrieved using <code>getAttributeNames</code>.
+    * <p/>
+    * <p>The attribute is returned as a <code>java.lang.Object</code> or some subclass. Attribute names should follow
+    * the same convention as package names. The Java Portlet API specification reserves names matching
+    * <code>java.*</code>, <code>javax.*</code>, and <code>sun.*</code>.
     *
-    * <p>The attribute is returned as a <code>java.lang.Object</code>
-    * or some subclass.
-    * Attribute names should follow the same convention as package
-    * names. The Java Portlet API specification reserves names
-    * matching <code>java.*</code>, <code>javax.*</code>,
-    * and <code>sun.*</code>.
-    *
-    *
-    * @param name 	a <code>String</code> specifying the name
-    *			of the attribute
-    *
-    * @return 		an <code>Object</code> containing the value
-    *			of the attribute, or <code>null</code>
-    *			if no attribute exists matching the given
-    *			name
-    *
-    * @see 		#getAttributeNames
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the name of the attribute
+    * @return an <code>Object</code> containing the value of the attribute, or <code>null</code> if no attribute exists
+    *         matching the given name
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
+    * @see #getAttributeNames
     */
    Object getAttribute(String name) throws IllegalArgumentException;
 
    /**
-    * Returns an <code>Enumeration</code> containing the attribute names
-    * available within this portlet context, or an emtpy
-    * <code>Enumeration</code> if no attributes are available. Use the
-    * {@link #getAttribute} method with an attribute name
-    * to get the value of an attribute.
+    * Returns an <code>Enumeration</code> containing the attribute names available within this portlet context, or an
+    * emtpy <code>Enumeration</code> if no attributes are available. Use the {@link #getAttribute} method with an
+    * attribute name to get the value of an attribute.
     *
-    * @return 		an <code>Enumeration</code> of attribute names
-    *
-    * @see		#getAttribute
+    * @return an <code>Enumeration</code> of attribute names
+    * @see      #getAttribute
     */
    Enumeration getAttributeNames();
 
    /**
-    * Returns a String containing the value of the named context-wide
-    * initialization parameter, or <code>null</code> if the parameter does not exist.
-    * This method provides configuration information which may be useful for
-    * an entire "portlet application".
+    * Returns a String containing the value of the named context-wide initialization parameter, or <code>null</code> if
+    * the parameter does not exist. This method provides configuration information which may be useful for an entire
+    * "portlet application".
     *
-    * @param	name	a <code>String</code> containing the name of the
-    *                    requested parameter
-    *
-    * @return 		a <code>String</code> containing the value
-    *			of the initialization parameter, or
-    *                    <code>null</code> if the parameter does not exist.
-    *
-    * @see  #getInitParameterNames
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @return a <code>String</code> containing the value of the initialization parameter, or <code>null</code> if the
+    *         parameter does not exist.
+    * @param   name   a <code>String</code> containing the name of the requested parameter
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
+    * @see #getInitParameterNames
     */
    String getInitParameter(String name) throws IllegalArgumentException;
 
    /**
-    * Returns the names of the context initialization parameters as an
-    * <code>Enumeration</code> of String objects, or an empty Enumeration if the context
-    * has no initialization parameters.
+    * Returns the names of the context initialization parameters as an <code>Enumeration</code> of String objects, or an
+    * empty Enumeration if the context has no initialization parameters.
     *
-    * @return 	      an <code>Enumeration</code> of <code>String</code>
-    *                  objects containing the names of the context
-    *                  initialization parameters
-    *
-    * @see  #getInitParameter
+    * @return an <code>Enumeration</code> of <code>String</code> objects containing the names of the context
+    *         initialization parameters
+    * @see #getInitParameter
     */
    Enumeration getInitParameterNames();
 
    /**
-    * Writes the specified message to a portlet log file, usually an event log.
-    * The name and type of the portlet log file is specific to the portlet container.
-    * <p>
-    * This method mapps to the <code>ServletContext.log</code> method.
-    * The portlet container may in addition log this message in a
-    * portlet container specific log file.
+    * Writes the specified message to a portlet log file, usually an event log. The name and type of the portlet log
+    * file is specific to the portlet container.
+    * <p/>
+    * This method mapps to the <code>ServletContext.log</code> method. The portlet container may in addition log this
+    * message in a portlet container specific log file.
     *
-    * @param msg 	a <code>String</code> specifying the
-    *			message to be written to the log file
+    * @param msg a <code>String</code> specifying the message to be written to the log file
     */
    void log(String msg);
 
    /**
-    * Writes an explanatory message and a stack trace for a given
-    * Throwable exception to the portlet log file.
-    * The name and type of the portlet log file is specific to the
-    * portlet container, usually an event log.
-    * <p>
-    * This method is mapped to the <code>ServletContext.log</code> method.
-    * The portlet container may in addition log this message in a
-    * portlet container specific log file.
+    * Writes an explanatory message and a stack trace for a given Throwable exception to the portlet log file. The name
+    * and type of the portlet log file is specific to the portlet container, usually an event log.
+    * <p/>
+    * This method is mapped to the <code>ServletContext.log</code> method. The portlet container may in addition log
+    * this message in a portlet container specific log file.
     *
-    * @param msg 		a <code>String</code> that
-    *				describes the error or exception
-    * @param throwable 	        the <code>Throwable</code> error
-    *				or exception
+    * @param msg       a <code>String</code> that describes the error or exception
+    * @param throwable the <code>Throwable</code> error or exception
     */
    void log(String msg, Throwable throwable);
 
    /**
-    * Removes the attribute with the given name from the portlet context.
-    * After removal, subsequent calls to
-    * {@link #getAttribute} to retrieve the attribute's value
-    * will return <code>null</code>.
+    * Removes the attribute with the given name from the portlet context. After removal, subsequent calls to {@link
+    * #getAttribute} to retrieve the attribute's value will return <code>null</code>.
     *
-    * @param name	a <code>String</code> specifying the name
-    * 			of the attribute to be removed
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the name of the attribute to be removed
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
     */
    void removeAttribute(String name) throws IllegalArgumentException;
 
    /**
-    * Binds an object to a given attribute name in this portlet context.
-    * If the name specified is already used for an attribute, this method
-    * removes the old attribute and binds the name to the new attribute.
-    * <p>
-    * If a null value is passed, the effect is the same as calling
-    * <code>removeAttribute()</code>.
+    * Binds an object to a given attribute name in this portlet context. If the name specified is already used for an
+    * attribute, this method removes the old attribute and binds the name to the new attribute.
+    * <p/>
+    * If a null value is passed, the effect is the same as calling <code>removeAttribute()</code>.
+    * <p/>
+    * <p>Attribute names should follow the same convention as package names. The Java Portlet API specification reserves
+    * names matching <code>java.*</code>, <code>javax.*</code>, and <code>sun.*</code>.
     *
-    * <p>Attribute names should follow the same convention as package
-    * names. The Java Portlet API specification reserves names
-    * matching <code>java.*</code>, <code>javax.*</code>, and
-    * <code>sun.*</code>.
-    *
-    * @param name 	a <code>String</code> specifying the name
-    *			of the attribute
-    * @param object 	an <code>Object</code> representing the
-    *			attribute to be bound
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if name is <code>null</code>.
+    * @param name   a <code>String</code> specifying the name of the attribute
+    * @param object an <code>Object</code> representing the attribute to be bound
+    * @exception java.lang.IllegalArgumentException if name is <code>null</code>.
     */
    void setAttribute(String name, Object object) throws IllegalArgumentException;
 
    /**
-    * Returns the name of this portlet application correponding to this PortletContext as specified
-    * in the <code>web.xml</code> deployment descriptor for this web application by the
-    * <code>display-name</code> element.
+    * Returns the name of this portlet application correponding to this PortletContext as specified in the
+    * <code>web.xml</code> deployment descriptor for this web application by the <code>display-name</code> element.
     *
-    *
-    * @return  The name of the web application or null if no name has been declared in the deployment descriptor.
+    * @return The name of the web application or null if no name has been declared in the deployment descriptor.
     */
    String getPortletContextName();
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>PortletException</CODE> class defines a general exception
- * that a portlet can throw when it is unable to perform its operation
- * successfully.
+ * The <CODE>PortletException</CODE> class defines a general exception that a portlet can throw when it is unable to
+ * perform its operation successfully.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -35,20 +35,16 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = -5042678869822737513L;
 
-   /**
-    * Constructs a new portlet exception.
-    */
+   /** Constructs a new portlet exception. */
    public PortletException()
    {
       super();
    }
 
    /**
-    * Constructs a new portlet exception with the given text. The
-    * portlet container may use the text write it to a log.
+    * Constructs a new portlet exception with the given text. The portlet container may use the text write it to a log.
     *
-    * @param   text
-    *          the exception text
+    * @param text the exception text
     */
    public PortletException(String text)
    {
@@ -56,18 +52,11 @@
    }
 
    /**
-    * Constructs a new portlet exception when the portlet needs to do
-    * the following:
-    * <ul>
-    * <li>throw an exception
-    * <li>include the "root cause" exception
-    * <li>include a description message
-    * </ul>
+    * Constructs a new portlet exception when the portlet needs to do the following: <ul> <li>throw an exception
+    * <li>include the "root cause" exception <li>include a description message </ul>
     *
-    * @param   text
-    *          the exception text
-    * @param   cause
-    *          the root cause
+    * @param text  the exception text
+    * @param cause the root cause
     */
    public PortletException(String text, Throwable cause)
    {
@@ -75,12 +64,10 @@
    }
 
    /**
-    * Constructs a new portlet exception when the portlet needs to throw an
-    * exception. The exception's message is based on the localized message
-    * of the underlying exception.
+    * Constructs a new portlet exception when the portlet needs to throw an exception. The exception's message is based
+    * on the localized message of the underlying exception.
     *
-    * @param   cause
-    *          the root cause
+    * @param cause the root cause
     */
    public PortletException(Throwable cause)
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletMode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletMode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletMode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,44 +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 javax.portlet;
 
 /**
- * The <CODE>PortletMode</CODE> class represents
- * the possible modes that a portlet can assume.
- * <P>
- * A portlet mode indicates the function a portlet is performing.
- * Normally, portlets perform different tasks and create different
- * content depending on the function they are currently performing.
- * When invoking a portlet, the portlet container provides the
- * current portlet mode to the portlet.
- * <p>
- * Portlets can programmatically change their portlet
- * mode when processing an action request.
- * <P>
- * This class defines the default portlet modes <code>EDIT, HELP, VIEW</code>.
- * Additional portlet modes may be defined by calling the constructor
- * of this class. If a portal/portlet-container does not support a
- * custom portlet mode defined in the portlet application deployment descriptor,
- * the custom portlet mode will be ignored by the portal/portlet container.
+ * The <CODE>PortletMode</CODE> class represents the possible modes that a portlet can assume.
+ * <p/>
+ * A portlet mode indicates the function a portlet is performing. Normally, portlets perform different tasks and create
+ * different content depending on the function they are currently performing. When invoking a portlet, the portlet
+ * container provides the current portlet mode to the portlet.
+ * <p/>
+ * Portlets can programmatically change their portlet mode when processing an action request.
+ * <p/>
+ * This class defines the default portlet modes <code>EDIT, HELP, VIEW</code>. Additional portlet modes may be defined
+ * by calling the constructor of this class. If a portal/portlet-container does not support a custom portlet mode
+ * defined in the portlet application deployment descriptor, the custom portlet mode will be ignored by the
+ * portal/portlet container.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -47,42 +43,37 @@
 {
 
    /**
-    * Within the <code>EDIT</code> portlet mode, a portlet should provide
-    * content and logic that lets a user customize the behavior of the portlet.
-    * The EDIT portlet mode may include one or more screens among which
-    * users can navigate to enter their customization data.
-    * <p>
-    * Typically, portlets in <code>EDIT</code> portlet mode will
-    * set or update portlet preferences.
-    * <P>
+    * Within the <code>EDIT</code> portlet mode, a portlet should provide content and logic that lets a user customize
+    * the behavior of the portlet. The EDIT portlet mode may include one or more screens among which users can navigate
+    * to enter their customization data.
+    * <p/>
+    * Typically, portlets in <code>EDIT</code> portlet mode will set or update portlet preferences.
+    * <p/>
     * This mode is optional.
-    * <p>
+    * <p/>
     * The string value for this mode is <code>"edit"</code>.
     */
    public static final PortletMode EDIT = new PortletMode("edit");
 
    /**
-    * When in <code>HELP</code> portlet mode, a portlet should provide help
-    * information about the portlet. This help information could be
-    * a simple help screen explaining the entire portlet in
-    * coherent text or it could be context-sensitive help.
-    * <P>
+    * When in <code>HELP</code> portlet mode, a portlet should provide help information about the portlet. This help
+    * information could be a simple help screen explaining the entire portlet in coherent text or it could be
+    * context-sensitive help.
+    * <p/>
     * This mode is optional.
-    * <p>
+    * <p/>
     * The string value for this mode is <code>"help"</code>.
     */
    public static final PortletMode HELP = new PortletMode("help");
 
    /**
-    * The expected functionality for a portlet in <code>VIEW</code> portlet mode
-    * is to generate markup reflecting the current state of the portlet.
-    * For example, the <code>VIEW</code> portlet mode of a portlet may
-    * include one or more screens that the user can navigate and interact
-    * with, or it may consist of static content that does not require any
-    * user interaction.
-    * <P>
+    * The expected functionality for a portlet in <code>VIEW</code> portlet mode is to generate markup reflecting the
+    * current state of the portlet. For example, the <code>VIEW</code> portlet mode of a portlet may include one or more
+    * screens that the user can navigate and interact with, or it may consist of static content that does not require
+    * any user interaction.
+    * <p/>
     * This mode must be supported by the portlet.
-    * <p>
+    * <p/>
     * The string value for this mode is <code>"view"</code>.
     */
    public static final PortletMode VIEW = new PortletMode("view");
@@ -91,9 +82,8 @@
 
    /**
     * Creates a new portlet mode with the given name.
-    * <p>
-    * Upper case letters in the name are converted to
-    * lower case letters.
+    * <p/>
+    * Upper case letters in the name are converted to lower case letters.
     *
     * @param name The name of the portlet mode
     */
@@ -107,14 +97,11 @@
    }
 
    /**
-    * Compares the specified object with this portlet mode
-    * for equality. Returns <code>true</code> if the
-    * Strings <code>equals</code> method for the String
-    * representing the two portlet modes returns <code>true</code>.
+    * Compares the specified object with this portlet mode for equality. Returns <code>true</code> if the Strings
+    * <code>equals</code> method for the String representing the two portlet modes returns <code>true</code>.
     *
-    * @param   o portlet mode to compare this portlet mode with
-    *
-    * @return  true, if the specified object is equal with this portlet mode
+    * @param o portlet mode to compare this portlet mode with
+    * @return true, if the specified object is equal with this portlet mode
     */
    public boolean equals(Object o)
    {
@@ -126,11 +113,10 @@
    }
 
    /**
-    * Returns the hash code value for this portlet mode.
-    * The hash code is constructed by producing the
-    * hash value of the String value of this mode.
+    * Returns the hash code value for this portlet mode. The hash code is constructed by producing the hash value of the
+    * String value of this mode.
     *
-    * @return  hash code value for this portlet mode
+    * @return hash code value for this portlet mode
     */
    public int hashCode()
    {
@@ -138,10 +124,9 @@
    }
 
    /**
-    * Returns a String representation of this portlet mode.
-    * Portlet mode names are always lower case names.
+    * Returns a String representation of this portlet mode. Portlet mode names are always lower case names.
     *
-    * @return  String representation of this portlet mode
+    * @return String representation of this portlet mode
     */
    public String toString()
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletModeException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletModeException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletModeException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.IOException;
@@ -26,10 +27,9 @@
 import java.io.ObjectOutputStream;
 
 /**
- * The <CODE>PortletModeException</CODE> is thrown when a portlet
- * tries to use or set a portlet mode that is not supported by the current
- * runtime environment or the portlet.
-s *
+ * The <CODE>PortletModeException</CODE> is thrown when a portlet tries to use or set a portlet mode that is not
+ * supported by the current runtime environment or the portlet. s *
+ *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -42,14 +42,11 @@
    private transient PortletMode mode;
 
    /**
-    * Constructs a new portlet mode exception with the given text and the
-    * portlet mode that caused this exception. The
+    * Constructs a new portlet mode exception with the given text and the portlet mode that caused this exception. The
     * portlet container may use the text and portlet mode write it to a log.
     *
-    * @param   text
-    *          the exception text
-    * @param   mode
-    *          the mode causing the exception
+    * @param text the exception text
+    * @param mode the mode causing the exception
     */
    public PortletModeException(String text, PortletMode mode)
    {
@@ -58,22 +55,13 @@
    }
 
    /**
-    * Constructs a new portlet mode exception when the portlet needs to do
-    * the following:
-    * <ul>
-    * <il>throw an exception
-    * <li>include a message about the "root cause" that interfered
-    *     with its normal operation
-    * <li>include a description message
-    * <li>include the portlet mode that caused this exception
-    * </ul>
+    * Constructs a new portlet mode exception when the portlet needs to do the following: <ul> <il>throw an exception
+    * <li>include a message about the "root cause" that interfered with its normal operation <li>include a description
+    * message <li>include the portlet mode that caused this exception </ul>
     *
-    * @param   text
-    *          the exception text
-    * @param   cause
-    *          the root cause
-    * @param   mode
-    *          the mode causing the exception
+    * @param text  the exception text
+    * @param cause the root cause
+    * @param mode  the mode causing the exception
     */
    public PortletModeException(String text, Throwable cause, PortletMode mode)
    {
@@ -82,14 +70,11 @@
    }
 
    /**
-    * Constructs a new portlet mode exception when the portlet needs to throw an
-    * exception. The exception message is based on the localized message
-    * of the underlying exception and the portlet mode that caused this exception.
+    * Constructs a new portlet mode exception when the portlet needs to throw an exception. The exception message is
+    * based on the localized message of the underlying exception and the portlet mode that caused this exception.
     *
-    * @param   cause
-    *          the root cause
-    * @param   mode
-    *          the mode causing the exception
+    * @param cause the root cause
+    * @param mode  the mode causing the exception
     */
    public PortletModeException(Throwable cause, PortletMode mode)
    {
@@ -100,7 +85,7 @@
    /**
     * Returns the unsupported portlet mode causing this exception.
     *
-    * @return  the portlet mode that caused this exception
+    * @return the portlet mode that caused this exception
     */
    public PortletMode getMode()
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletPreferences.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletPreferences.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletPreferences.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.IOException;
@@ -26,25 +27,17 @@
 import java.util.Map;
 
 /**
- * The <CODE>PortletPreferences</CODE> interface allows the portlet to store
- * configuration data. It is not the
- * purpose of this interface to replace general purpose databases.
- * <p>
- * There are two different types of preferences:
- * <ul>
- * <li>modifiable preferences - these preferences can be changed by the
- *     portlet in any standard portlet mode (<code>EDIT, HELP, VIEW</code>).
- *     Per default every preference is modifiable.
- * <li>read-only preferences - these preferences cannot be changed by the
- *     portlet in any standard portlet mode, but may be changed by administrative modes.
- *     Preferences are read-only, if the are defined in the
- *     deployment descriptor with <code>read-only</code> set to <code>true</code>,
- *     or if the portlet container restricts write access.
- * </ul>
- * <p>
- * Changes are persisted when the <code>store</code> method is called. The <code>store</code> method
- * can only be invoked within the scope of a <code>processAction</code> call.
- * Changes that are not persisted are discarded when the
+ * The <CODE>PortletPreferences</CODE> interface allows the portlet to store configuration data. It is not the purpose
+ * of this interface to replace general purpose databases.
+ * <p/>
+ * There are two different types of preferences: <ul> <li>modifiable preferences - these preferences can be changed by
+ * the portlet in any standard portlet mode (<code>EDIT, HELP, VIEW</code>). Per default every preference is modifiable.
+ * <li>read-only preferences - these preferences cannot be changed by the portlet in any standard portlet mode, but may
+ * be changed by administrative modes. Preferences are read-only, if the are defined in the deployment descriptor with
+ * <code>read-only</code> set to <code>true</code>, or if the portlet container restricts write access. </ul>
+ * <p/>
+ * Changes are persisted when the <code>store</code> method is called. The <code>store</code> method can only be invoked
+ * within the scope of a <code>processAction</code> call. Changes that are not persisted are discarded when the
  * <code>processAction</code> or <code>render</code> method ends.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -54,193 +47,147 @@
 {
    /**
     * Returns a <code>Map</code> of the preferences.
-    * <p>
-    * The values in the returned <code>Map</code> are from type
-    * String array (<code>String[]</code>).
-    * <p>
+    * <p/>
+    * The values in the returned <code>Map</code> are from type String array (<code>String[]</code>).
+    * <p/>
     * If no preferences exist this method returns an empty <code>Map</code>.
     *
-    * @return     an immutable <code>Map</code> containing preference names as
-    *             keys and preference values as map values, or an empty <code>Map</code>
-    *             if no preference exist. The keys in the preference
-    *             map are of type String. The values in the preference map are of type
-    *             String array (<code>String[]</code>).
+    * @return an immutable <code>Map</code> containing preference names as keys and preference values as map values, or
+    *         an empty <code>Map</code> if no preference exist. The keys in the preference map are of type String. The
+    *         values in the preference map are of type String array (<code>String[]</code>).
     */
    Map getMap();
 
    /**
-    * Returns all of the keys that have an associated value,
-    * or an empty <code>Enumeration</code> if no keys are
+    * Returns all of the keys that have an associated value, or an empty <code>Enumeration</code> if no keys are
     * available.
     *
-    * @return an Enumeration of the keys that have an associated value,
-    *         or an empty <code>Enumeration</code> if no keys are
-    *         available.
+    * @return an Enumeration of the keys that have an associated value, or an empty <code>Enumeration</code> if no keys
+    *         are available.
     */
    Enumeration getNames();
 
    /**
-    * Returns the first String value associated with the specified key of this preference.
-    * If there is one or more preference values associated with the given key
-    * it returns the first associated value.
-    * If there are no preference values associated with the given key, or the
-    * backing preference database is unavailable, it returns the given
+    * Returns the first String value associated with the specified key of this preference. If there is one or more
+    * preference values associated with the given key it returns the first associated value. If there are no preference
+    * values associated with the given key, or the backing preference database is unavailable, it returns the given
     * default value.
     *
     * @param key key for which the associated value is to be returned
-    * @param def the value to be returned in the event that there is no
-    *            value available associated with this <code>key</code>.
-    *
-    * @return the value associated with <code>key</code>, or <code>def</code>
-    *         if no value is associated with <code>key</code>, or the backing
-    *         store is inaccessible.
-    *
-    * @exception java.lang.IllegalArgumentException
-    *         if <code>key</code> is <code>null</code>. (A
-    *         <code>null</code> value for <code>def</code> <i>is</i> permitted.)
-    *
-    * @see #getValues(String, String[])
+    * @param def the value to be returned in the event that there is no value available associated with this
+    *            <code>key</code>.
+    * @return the value associated with <code>key</code>, or <code>def</code> if no value is associated with
+    *         <code>key</code>, or the backing store is inaccessible.
+    * @throws java.lang.IllegalArgumentException
+    *          if <code>key</code> is <code>null</code>. (A <code>null</code> value for <code>def</code> <i>is</i>
+    *          permitted.)
+    * @see #getValues(String,String[])
     */
    String getValue(String key, String def) throws IllegalArgumentException;
 
    /**
     * Returns the String array value associated with the specified key in this preference.
+    * <p/>
+    * <p>Returns the specified default if there is no value associated with the key, or if the backing store is
+    * inaccessible.
+    * <p/>
+    * <p>If the implementation supports <i>stored defaults</i> and such a default exists and is accessible, it is used
+    * in favor of the specified default.
     *
-    * <p>Returns the specified default if there is no value
-    * associated with the key, or if the backing store is inaccessible.
-    *
-    * <p>If the implementation supports <i>stored defaults</i> and such a
-    * default exists and is accessible, it is used in favor of the
-    * specified default.
-    *
-    *
     * @param key key for which associated value is to be returned.
-    * @param def the value to be returned in the event that this
-    *        preference node has no value associated with <code>key</code>
-    *        or the associated value cannot be interpreted as a String array,
-    *        or the backing store is inaccessible.
-    *
-    * @return the String array value associated with
-    *         <code>key</code>, or <code>def</code> if the
-    *         associated value does not exist.
-    *
-    * @exception java.lang.IllegalArgumentException if <code>key</code> is <code>null</code>.  (A
-    *         <code>null</code> value for <code>def</code> <i>is</i> permitted.)
-    *
+    * @param def the value to be returned in the event that this preference node has no value associated with
+    *            <code>key</code> or the associated value cannot be interpreted as a String array, or the backing store
+    *            is inaccessible.
+    * @return the String array value associated with <code>key</code>, or <code>def</code> if the associated value does
+    *         not exist.
+    * @throws java.lang.IllegalArgumentException
+    *          if <code>key</code> is <code>null</code>.  (A <code>null</code> value for <code>def</code> <i>is</i>
+    *          permitted.)
     * @see #getValue(String,String)
     */
    String[] getValues(String key, String[] def) throws IllegalArgumentException;
 
    /**
     * Returns true, if the value of this key cannot be modified by the user.
-    * <p>
-    * Modifiable preferences can be changed by the
-    * portlet in any standard portlet mode (<code>EDIT, HELP, VIEW</code>).
+    * <p/>
+    * Modifiable preferences can be changed by the portlet in any standard portlet mode (<code>EDIT, HELP, VIEW</code>).
     * Per default every preference is modifiable.
-    * <p>
-    * Read-only preferences cannot be changed by the
-    * portlet in any standard portlet mode, but inside of custom modes
-    * it may be allowed changing them.
-    * Preferences are read-only, if they are defined in the
-    * deployment descriptor with <code>read-only</code> set to <code>true</code>,
-    * or if the portlet container restricts write access.
+    * <p/>
+    * Read-only preferences cannot be changed by the portlet in any standard portlet mode, but inside of custom modes it
+    * may be allowed changing them. Preferences are read-only, if they are defined in the deployment descriptor with
+    * <code>read-only</code> set to <code>true</code>, or if the portlet container restricts write access.
     *
-    * @return  false, if the value of this key can be changed, or
-    *          if the key is not known
-    *
-    * @exception java.lang.IllegalArgumentException
-    *         if <code>key</code> is <code>null</code>.
+    * @return false, if the value of this key can be changed, or if the key is not known
+    * @throws java.lang.IllegalArgumentException
+    *          if <code>key</code> is <code>null</code>.
     */
    boolean isReadOnly(String key) throws IllegalArgumentException;
 
    /**
     * Resets or removes the value associated with the specified key.
-    * <p>
-    * If this implementation supports stored defaults, and there is such
-    * a default for the specified preference, the given key will be
-    * reset to the stored default.
-    * <p>
+    * <p/>
+    * If this implementation supports stored defaults, and there is such a default for the specified preference, the
+    * given key will be reset to the stored default.
+    * <p/>
     * If there is no default available the key will be removed.
     *
-    * @param  key to reset
-    *
-    * @exception  java.lang.IllegalArgumentException if key is <code>null</code>.
-    * @exception  ReadOnlyException
-    *                 if this preference cannot be modified for this request
+    * @param key to reset
+    * @throws java.lang.IllegalArgumentException
+    *                           if key is <code>null</code>.
+    * @throws ReadOnlyException if this preference cannot be modified for this request
     */
    void reset(String key) throws IllegalArgumentException, ReadOnlyException;
 
    /**
-    * Associates the specified String value with the specified key in this
-    * preference.
-    * <p>
-    * The key cannot be <code>null</code>, but <code>null</code> values
-    * for the value parameter are allowed.
+    * Associates the specified String value with the specified key in this preference.
+    * <p/>
+    * The key cannot be <code>null</code>, but <code>null</code> values for the value parameter are allowed.
     *
-    * @param key key with which the specified value is to be associated.
+    * @param key   key with which the specified value is to be associated.
     * @param value value to be associated with the specified key.
-    *
-    * @exception  ReadOnlyException
-    *                 if this preference cannot be modified for this request
-    * @exception java.lang.IllegalArgumentException if key is <code>null</code>,
-    *                 or <code>key.length()</code>
-    *                 or <code>value.length</code> are to long. The maximum length
-    *                 for key and value are implementation specific.
-    *
-    * @see #setValues(String, String[])
+    * @throws ReadOnlyException if this preference cannot be modified for this request
+    * @throws java.lang.IllegalArgumentException
+    *                           if key is <code>null</code>, or <code>key.length()</code> or <code>value.length</code>
+    *                           are to long. The maximum length for key and value are implementation specific.
+    * @see #setValues(String,String[])
     */
-   void setValue(String key, String value)  throws IllegalArgumentException, ReadOnlyException;
+   void setValue(String key, String value) throws IllegalArgumentException, ReadOnlyException;
 
    /**
-    * Associates the specified String array value with the specified key in this
-    * preference.
-    * <p>
-    * The key cannot be <code>null</code>, but <code>null</code> values
-    * in the values parameter are allowed.
+    * Associates the specified String array value with the specified key in this preference.
+    * <p/>
+    * The key cannot be <code>null</code>, but <code>null</code> values in the values parameter are allowed.
     *
-    * @param key key with which the  value is to be associated
+    * @param key    key with which the  value is to be associated
     * @param values values to be associated with key
-    *
-    * @exception  java.lang.IllegalArgumentException if key is <code>null</code>, or
-    *                 <code>key.length()</code>
-    *                 is to long or <code>value.size</code> is to large.  The maximum
-    *                 length for key and maximum size for value are implementation specific.
-    * @exception  ReadOnlyException
-    *                 if this preference cannot be modified for this request
-    *
+    * @throws java.lang.IllegalArgumentException
+    *                           if key is <code>null</code>, or <code>key.length()</code> is to long or
+    *                           <code>value.size</code> is to large.  The maximum length for key and maximum size for
+    *                           value are implementation specific.
+    * @throws ReadOnlyException if this preference cannot be modified for this request
     * @see #setValue(String,String)
     */
-   void setValues(String key, String[] values)  throws IllegalArgumentException, ReadOnlyException;
+   void setValues(String key, String[] values) throws IllegalArgumentException, ReadOnlyException;
 
    /**
-    * Commits all changes made to the preferences via the
-    * <code>set</code> methods in the persistent store.
-    * <P>
-    * If this call returns succesfull, all changes are made
-    * persistent. If this call fails, no changes are made
-    * in the persistent store. This call is an atomic operation
-    * regardless of how many preference attributes have been modified.
-    * <P>
-    * All changes made to preferences not followed by a call
-    * to the <code>store</code> method are discarded when the
+    * Commits all changes made to the preferences via the <code>set</code> methods in the persistent store.
+    * <p/>
+    * If this call returns succesfull, all changes are made persistent. If this call fails, no changes are made in the
+    * persistent store. This call is an atomic operation regardless of how many preference attributes have been
+    * modified.
+    * <p/>
+    * All changes made to preferences not followed by a call to the <code>store</code> method are discarded when the
     * portlet finishes the <code>processAction</code> method.
-    * <P>
-    * If a validator is defined for this preferences in the
-    * deployment descriptor, this validator is called before
-    * the actual store is performed to check wether the given
-    * preferences are vaild. If this check fails a
+    * <p/>
+    * If a validator is defined for this preferences in the deployment descriptor, this validator is called before the
+    * actual store is performed to check wether the given preferences are vaild. If this check fails a
     * <code>ValidatorException</code> is thrown.
     *
-    * @exception  java.io.IOException
-    *                 if changes cannot be written into
-    *                 the backend store
-    * @exception  ValidatorException
-    *                 if the validation performed by the
-    *                 associated validator fails
-    * @exception  java.lang.IllegalStateException
-    *                 if this method is called inside a render call
-    *
-    * @see  PreferencesValidator
+    * @throws java.io.IOException if changes cannot be written into the backend store
+    * @throws ValidatorException  if the validation performed by the associated validator fails
+    * @throws java.lang.IllegalStateException
+    *                             if this method is called inside a render call
+    * @see PreferencesValidator
     */
    void store() throws IOException, ValidatorException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.security.Principal;
@@ -27,575 +28,422 @@
 import java.util.Map;
 
 /**
- * The <CODE>PortletRequest</CODE> defines the base interface to provide client
- * request information to a portlet. The portlet container uses two specialized
- * versions of this interface when invoking a portlet, <CODE>ActionRequest</CODE>
- * and <CODE>RenderRequest</CODE>. The portlet container creates these objects and
- * passes them as  arguments to the portlet's <CODE>processAction</CODE> and
- * <CODE>render</CODE> methods.
+ * The <CODE>PortletRequest</CODE> defines the base interface to provide client request information to a portlet. The
+ * portlet container uses two specialized versions of this interface when invoking a portlet, <CODE>ActionRequest</CODE>
+ * and <CODE>RenderRequest</CODE>. The portlet container creates these objects and passes them as  arguments to the
+ * portlet's <CODE>processAction</CODE> and <CODE>render</CODE> methods.
  *
- * @see ActionRequest
- * @see RenderRequest
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see ActionRequest
+ * @see RenderRequest
  */
-public interface PortletRequest {
+public interface PortletRequest
+{
 
-   /**
-    * String identifier for Basic authentication. Value "BASIC".
-    */
-    String BASIC_AUTH = "BASIC";
+   /** String identifier for Basic authentication. Value "BASIC". */
+   String BASIC_AUTH = "BASIC";
 
-   /**
-    * String identifier for Form based authentication. Value "FORM".
-    */
-    String FORM_AUTH = "FORM";
+   /** String identifier for Form based authentication. Value "FORM". */
+   String FORM_AUTH = "FORM";
 
-   /**
-    * String identifier for Certification based authentication. Value "CLIENT_CERT".
-    */
-    String CLIENT_CERT_AUTH = "CLIENT_CERT";
+   /** String identifier for Certification based authentication. Value "CLIENT_CERT". */
+   String CLIENT_CERT_AUTH = "CLIENT_CERT";
 
-   /**
-    * String identifier for Digest based authentication. Value "DIGEST".
-    */
-    String DIGEST_AUTH = "DIGEST";
+   /** String identifier for Digest based authentication. Value "DIGEST". */
+   String DIGEST_AUTH = "DIGEST";
 
-   /** Used to retrieve user information attributes with the
-    * <code>getAttribute</code> call. The user information is returned
-    * as a <code>Map</code> object. The portlet must define the
-    * user information attribute it is interested in inside the
-    * <code>user-attribute</code> section of the deployment descriptor.
-    * If an attribute is not supported
-    * by the current runtime system it will not show up in the user
-    * attribute map.<BR>
-    * If the user-attribute is supported by the runtime system, but not
-    * defined for a particular user, then for that user the attribute
-    * exists in the returned map and the attribute has a <code>null</code> value.
-    * <p>
-    * If the user-attribute is not defined for the current user it
-    * will not show up in the Map.
-    * <p>
+   /**
+    * Used to retrieve user information attributes with the <code>getAttribute</code> call. The user information is
+    * returned as a <code>Map</code> object. The portlet must define the user information attribute it is interested in
+    * inside the <code>user-attribute</code> section of the deployment descriptor. If an attribute is not supported by
+    * the current runtime system it will not show up in the user attribute map.<BR> If the user-attribute is supported
+    * by the runtime system, but not defined for a particular user, then for that user the attribute exists in the
+    * returned map and the attribute has a <code>null</code> value.
+    * <p/>
+    * If the user-attribute is not defined for the current user it will not show up in the Map.
+    * <p/>
     * The value is <code>javax.portlet.userinfo</code>.
     */
-    String USER_INFO = "javax.portlet.userinfo";
+   String USER_INFO = "javax.portlet.userinfo";
 
    /**
-    * Returns true, if the given window state is valid
-    * to be set for this portlet in the context
-    * of the current request.
+    * Returns true, if the given window state is valid to be set for this portlet in the context of the current
+    * request.
     *
-    * @param  state    window state to checked
-    *
-    * @return    true, if it is valid for this portlet
-    *             in this request to change to the
-    *            given window state
-    *
+    * @param state window state to checked
+    * @return true, if it is valid for this portlet in this request to change to the given window state
     */
-    boolean isWindowStateAllowed(WindowState state);
+   boolean isWindowStateAllowed(WindowState state);
 
    /**
-    * Returns true, if the given portlet mode is a valid
-    * one to set for this portlet  in the context
-    * of the current request.
+    * Returns true, if the given portlet mode is a valid one to set for this portlet  in the context of the current
+    * request.
     *
-    * @param  mode    portlet mode to check
-    *
-    * @return    true, if it is valid for this portlet
-    *             in this request to change to the
-    *            given portlet mode
-    *
+    * @param mode portlet mode to check
+    * @return true, if it is valid for this portlet in this request to change to the given portlet mode
     */
-    boolean isPortletModeAllowed(PortletMode mode);
+   boolean isPortletModeAllowed(PortletMode mode);
 
    /**
     * Returns the current portlet mode of the portlet.
     *
-    * @return   the portlet mode
+    * @return the portlet mode
     */
-    PortletMode getPortletMode();
+   PortletMode getPortletMode();
 
    /**
     * Returns the current window state of the portlet.
     *
-    * @return   the window state
+    * @return the window state
     */
-    WindowState getWindowState();
+   WindowState getWindowState();
 
    /**
     * Returns the preferences object associated with the portlet.
     *
     * @return the portlet preferences
     */
-    PortletPreferences getPreferences();
+   PortletPreferences getPreferences();
 
    /**
-    * Returns the current portlet session or, if there is no current session,
-    * creates one and returns the new session.
-    *  <p>
-    * Creating a new portlet session will result in creating
-    * a new <code>HttpSession</code> on which the portlet session is based on.
+    * Returns the current portlet session or, if there is no current session, creates one and returns the new session.
+    * <p/>
+    * Creating a new portlet session will result in creating a new <code>HttpSession</code> on which the portlet
+    * session is based on.
     *
     * @return the portlet session
     */
-    PortletSession getPortletSession();
+   PortletSession getPortletSession();
 
    /**
-    * Returns the current portlet session or, if there is no current session
-    * and the given flag is <CODE>true</CODE>, creates one and returns
-    * the new session.
-    * <P>
-    * If the given flag is <CODE>false</CODE> and there is no current
-    * portlet session, this method returns <CODE>null</CODE>.
-    *  <p>
-    * Creating a new portlet session will result in creating
-    * a new <code>HttpSession</code> on which the portlet session is based on.
+    * Returns the current portlet session or, if there is no current session and the given flag is <CODE>true</CODE>,
+    * creates one and returns the new session.
+    * <p/>
+    * If the given flag is <CODE>false</CODE> and there is no current portlet session, this method returns
+    * <CODE>null</CODE>.
+    * <p/>
+    * Creating a new portlet session will result in creating a new <code>HttpSession</code> on which the portlet
+    * session is based on.
     *
-    * @param create
-    *               <CODE>true</CODE> to create a new session, <BR>
-    *               <CODE>false</CODE> to return <CODE>null</CODE> if there
-    *               is no current session
+    * @param create <CODE>true</CODE> to create a new session, <BR> <CODE>false</CODE> to return <CODE>null</CODE> if
+    *               there is no current session
     * @return the portlet session
     */
-    PortletSession getPortletSession(boolean create);
+   PortletSession getPortletSession(boolean create);
 
    /**
-    * Returns the value of the specified request property
-    * as a <code>String</code>. If the request did not include a property
-    * of the specified name, this method returns <code>null</code>.
-    * <p>
-    * A portlet can access portal/portlet-container specific properties
-    * through this method and, if available, the
+    * Returns the value of the specified request property as a <code>String</code>. If the request did not include a
+    * property of the specified name, this method returns <code>null</code>.
+    * <p/>
+    * A portlet can access portal/portlet-container specific properties through this method and, if available, the
     * headers of the HTTP client request.
-    * <p>
-    * This method should only be used if the
-    * property has only one value. If the property might have
-    * more than one value, use {@link #getProperties}.
-    * <p>
-    * If this method is used with a multivalued
-    * parameter, the value returned is equal to the first value
-    * in the Enumeration returned by <code>getProperties</code>.
+    * <p/>
+    * This method should only be used if the property has only one value. If the property might have more than one
+    * value, use {@link #getProperties}.
+    * <p/>
+    * If this method is used with a multivalued parameter, the value returned is equal to the first value in the
+    * Enumeration returned by <code>getProperties</code>.
     *
-    * @param name		a <code>String</code> specifying the
-    *				property name
-    *
-    * @return			a <code>String</code> containing the
-    *				value of the requested
-    *				property, or <code>null</code>
-    *				if the request does not
-    *				have a property of that name.
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the property name
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return a <code>String</code> containing the value of the requested property, or <code>null</code> if the
+    * request does not have a property of that name.
     */
-    String getProperty(String name) throws IllegalArgumentException;
+   String getProperty(String name) throws IllegalArgumentException;
 
    /**
-    * Returns all the values of the specified request property
-    * as a <code>Enumeration</code> of <code>String</code> objects.
-    * <p>
-    * If the request did not include any propertys
-    * of the specified name, this method returns an empty
-    * <code>Enumeration</code>.
-    * The property name is case insensitive. You can use
-    * this method with any request property.
+    * Returns all the values of the specified request property as a <code>Enumeration</code> of <code>String</code>
+    * objects.
+    * <p/>
+    * If the request did not include any propertys of the specified name, this method returns an empty
+    * <code>Enumeration</code>. The property name is case insensitive. You can use this method with any request
+    * property.
     *
-    * @param name		a <code>String</code> specifying the
-    *				property name
-    *
-    * @return		a <code>Enumeration</code> containing
-    *                  	the values of the requested property. If
-    *                  	the request does not have any properties of
-    *                  	that name return an empty <code>Enumeration</code>.
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the property name
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return a <code>Enumeration</code> containing the values of the requested property. If the request does not have
+    * any properties of that name return an empty <code>Enumeration</code>.
     */
-    Enumeration getProperties(String name) throws IllegalArgumentException;
+   Enumeration getProperties(String name) throws IllegalArgumentException;
 
    /**
-    *
-    * Returns a <code>Enumeration</code> of all the property names
-    * this request contains. If the request has no
+    * Returns a <code>Enumeration</code> of all the property names this request contains. If the request has no
     * properties, this method returns an empty <code>Enumeration</code>.
     *
-    *
-    * @return			an <code>Enumeration</code> of all the
-    *				property names sent with this
-    *				request; if the request has
-    *				no properties, an empty <code>Enumeration</code>.
+    * @return an <code>Enumeration</code> of all the property names sent with this request; if the request has no
+    * properties, an empty <code>Enumeration</code>.
     */
-    Enumeration getPropertyNames();
+   Enumeration getPropertyNames();
 
    /**
     * Returns the context of the calling portal.
     *
     * @return the context of the calling portal
     */
-    PortalContext getPortalContext();
+   PortalContext getPortalContext();
 
    /**
-    * Returns the name of the authentication scheme used for the
-    * connection between client and portal,
-    * for example, <code>BASIC_AUTH</code>, <code>CLIENT_CERT_AUTH</code>,
-    * a custom one or <code>null</code> if there was no authentication.
+    * Returns the name of the authentication scheme used for the connection between client and portal, for example,
+    * <code>BASIC_AUTH</code>, <code>CLIENT_CERT_AUTH</code>, a custom one or <code>null</code> if there was no
+    * authentication.
     *
-    * @return		one of the static members <code>BASIC_AUTH</code>,
-    *			<code>FORM_AUTH</code>, <code>CLIENT_CERT_AUTH</code>,
-    *                    <code>DIGEST_AUTH</code> (suitable for == comparison)
-    *			indicating the authentication scheme,
-    *                    a custom one, or
-    *			<code>null</code> if the request was
-    *			not authenticated.
+    * @return one of the static members <code>BASIC_AUTH</code>, <code>FORM_AUTH</code>,
+    * <code>CLIENT_CERT_AUTH</code>, <code>DIGEST_AUTH</code> (suitable for == comparison) indicating the
+    * authentication scheme, a custom one, or <code>null</code> if the request was not authenticated.
     */
-    String getAuthType();
+   String getAuthType();
 
    /**
-    * Returns the context path which 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. 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.
-    * <p>
+    * Returns the context path which 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. 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.
+    * <p/>
     * To encode a URL the {@link PortletResponse#encodeURL} method must be used.
     *
-    * @return		a <code>String</code> specifying the
-    *			portion of the request URL that indicates the context
-    *			of the request
-    *
+    * @return a <code>String</code> specifying the portion of the request URL that indicates the context of the
+    * request
     * @see PortletResponse#encodeURL
     */
-    String getContextPath();
+   String getContextPath();
 
    /**
-    * Returns the login of the user making this request, if the user
-    * has been authenticated, or null if the user has not been authenticated.
+    * Returns the login of the user making this request, if the user has been authenticated, or null if the user has
+    * not been authenticated.
     *
-    * @return		a <code>String</code> specifying the login
-    *			of the user making this request, or <code>null</code>
-    *			if the user login is not known.
-    *
+    * @return a <code>String</code> specifying the login of the user making this request, or <code>null</code> if the
+    * user login is not known.
     */
-    String getRemoteUser();
+   String getRemoteUser();
 
    /**
-    * Returns a java.security.Principal object containing the name of the
-    * current authenticated user.
+    * Returns a java.security.Principal object containing the name of the current authenticated user.
     *
-    * @return		a <code>java.security.Principal</code> containing
-    *			the name of the user making this request, or
-    *			<code>null</code> if the user has not been
-    *			authenticated.
+    * @return a <code>java.security.Principal</code> containing the name of the user making this request, or
+    * <code>null</code> if the user has not been authenticated.
     */
-    Principal getUserPrincipal();
+   Principal getUserPrincipal();
 
    /**
-    * Returns a boolean indicating whether the authenticated user is
-    * included in the specified logical "role".  Roles and role membership can be
-    * defined using deployment descriptors.  If the user has not been
-    * authenticated, the method returns <code>false</code>.
+    * Returns a boolean indicating whether the authenticated user is included in the specified logical "role".  Roles
+    * and role membership can be defined using deployment descriptors.  If the user has not been authenticated, the
+    * method returns <code>false</code>.
     *
-    * @param role		a <code>String</code> specifying the name
-    *				of the role
-    *
-    * @return		a <code>boolean</code> indicating whether
-    *			the user making this request belongs to a given role;
-    *			<code>false</code> if the user has not been
-    *			authenticated.
+    * @param role a <code>String</code> specifying the name of the role
+    * @return a <code>boolean</code> indicating whether the user making this request belongs to a given role;
+    * <code>false</code> if the user has not been authenticated.
     */
-    boolean isUserInRole(String role);
+   boolean isUserInRole(String role);
 
    /**
+    * Returns the value of the named attribute as an <code>Object</code>, or <code>null</code> if no attribute of the
+    * given name exists.
+    * <p/>
+    * Attribute names should follow the same conventions as package names. This specification reserves names matching
+    * <code>java.*</code>, and <code>javax.*</code>.
+    * <p/>
+    * In a distributed portlet web application the <code>Object</code> needs to be serializable.
     *
-    * Returns the value of the named attribute as an <code>Object</code>,
-    * or <code>null</code> if no attribute of the given name exists.
-    * <p>
-    * Attribute names should follow the same conventions as package
-    * names. This specification reserves names matching <code>java.*</code>,
-    * and <code>javax.*</code>.
-    * <p>
-    * In a distributed portlet web application the <code>Object</code>
-    * needs to be serializable.
-    *
-    * @param name	a <code>String</code> specifying the name of
-    *			the attribute
-    *
-    * @return		an <code>Object</code> containing the value
-    *			of the attribute, or <code>null</code> if
-    *			the attribute does not exist.
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
-    *
+    * @param name a <code>String</code> specifying the name of the attribute
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return an <code>Object</code> containing the value of the attribute, or <code>null</code> if the attribute does
+    * not exist.
     */
-    Object getAttribute(String name) throws IllegalArgumentException;
+   Object getAttribute(String name) throws IllegalArgumentException;
 
    /**
-    * Returns an <code>Enumeration</code> containing the
-    * names of the attributes available to this request.
-    * This method returns an empty <code>Enumeration</code>
-    * if the request has no attributes available to it.
+    * Returns an <code>Enumeration</code> containing the names of the attributes available to this request. This method
+    * returns an empty <code>Enumeration</code> if the request has no attributes available to it.
     *
-    *
-    * @return		an <code>Enumeration</code> of strings
-    *			containing the names
-    * 			of the request attributes, or an empty
-    *                    <code>Enumeration</code> if the request
-    *                    has no attributes available to it.
+    * @return an <code>Enumeration</code> of strings containing the names of the request attributes, or an empty
+    * <code>Enumeration</code> if the request has no attributes available to it.
     */
-    Enumeration getAttributeNames();
+   Enumeration getAttributeNames();
 
    /**
-    * Returns the value of a request parameter as a <code>String</code>,
-    * or <code>null</code> if the parameter does not exist. Request parameters
-    * are extra information sent with the request. The returned parameter
-    * are "x-www-form-urlencoded" decoded.
-    * <p>
+    * Returns the value of a request parameter as a <code>String</code>, or <code>null</code> if the parameter does not
+    * exist. Request parameters are extra information sent with the request. The returned parameter are
+    * "x-www-form-urlencoded" decoded.
+    * <p/>
     * Only parameters targeted to the current portlet are accessible.
-    * <p>
-    * This method should only be used if the
-    * parameter has only one value. If the parameter might have
-    * more than one value, use {@link #getParameterValues}.
-    * <p>
-    * If this method is used with a multivalued
-    * parameter, the value returned is equal to the first value
-    * in the array returned by <code>getParameterValues</code>.
+    * <p/>
+    * This method should only be used if the parameter has only one value. If the parameter might have more than one
+    * value, use {@link #getParameterValues}.
+    * <p/>
+    * If this method is used with a multivalued parameter, the value returned is equal to the first value in the array
+    * returned by <code>getParameterValues</code>.
     *
-    *
-    *
-    * @param name 	a <code>String</code> specifying the
-    *			name of the parameter
-    *
-    * @return		a <code>String</code> representing the
-    *			single value of the parameter
-    *
-    * @see 		#getParameterValues
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
-    *
+    * @param name a <code>String</code> specifying the name of the parameter
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return a <code>String</code> representing the single value of the parameter
+    * @see #getParameterValues
     */
-    String getParameter(String name) throws IllegalArgumentException;
+   String getParameter(String name) throws IllegalArgumentException;
 
    /**
-    *
-    * Returns an <code>Enumeration</code> of <code>String</code>
-    * objects containing the names of the parameters contained
-    * in this request. If the request has
-    * no parameters, the method returns an
-    * empty <code>Enumeration</code>.
-    * <p>
+    * Returns an <code>Enumeration</code> of <code>String</code> objects containing the names of the parameters
+    * contained in this request. If the request has no parameters, the method returns an empty
+    * <code>Enumeration</code>.
+    * <p/>
     * Only parameters targeted to the current portlet are returned.
     *
-    *
-    * @return		an <code>Enumeration</code> of <code>String</code>
-    *			objects, each <code>String</code> containing
-    * 			the name of a request parameter; or an
-    *			empty <code>Enumeration</code> if the
-    *			request has no parameters.
+    * @return an <code>Enumeration</code> of <code>String</code> objects, each <code>String</code> containing the name
+    * of a request parameter; or an empty <code>Enumeration</code> if the request has no parameters.
     */
-    Enumeration getParameterNames();
+   Enumeration getParameterNames();
 
    /**
-    * Returns an array of <code>String</code> objects containing
-    * all of the values the given request parameter has, or
-    * <code>null</code> if the parameter does not exist.
-    * The returned parameters are "x-www-form-urlencoded" decoded.
-    * <p>
-    * If the parameter has a single value, the array has a length
-    * of 1.
+    * Returns an array of <code>String</code> objects containing all of the values the given request parameter has, or
+    * <code>null</code> if the parameter does not exist. The returned parameters are "x-www-form-urlencoded" decoded.
+    * <p/>
+    * If the parameter has a single value, the array has a length of 1.
     *
-    *
-    * @param name	a <code>String</code> containing the name of
-    *			the parameter the value of which is requested
-    *
-    * @return		an array of <code>String</code> objects
-    *			containing the parameter values.
-    *
-    * @see		#getParameter
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
-    *
+    * @param name a <code>String</code> containing the name of the parameter the value of which is requested
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return an array of <code>String</code> objects containing the parameter values.
+    * @see      #getParameter
     */
-    String[] getParameterValues(String name) throws IllegalArgumentException;
+   String[] getParameterValues(String name) throws IllegalArgumentException;
 
    /**
-    * Returns a <code>Map</code> of the parameters of this request.
-    * Request parameters are extra information sent with the request.
-    * The returned parameters are "x-www-form-urlencoded" decoded.
-    * <p>
-    * The values in the returned <code>Map</code> are from type
-    * String array (<code>String[]</code>).
-    * <p>
+    * Returns a <code>Map</code> of the parameters of this request. Request parameters are extra information sent with
+    * the request. The returned parameters are "x-www-form-urlencoded" decoded.
+    * <p/>
+    * The values in the returned <code>Map</code> are from type String array (<code>String[]</code>).
+    * <p/>
     * If no parameters exist this method returns an empty <code>Map</code>.
     *
-    * @return     an immutable <code>Map</code> containing parameter names as
-    *             keys and parameter values as map values, or an empty <code>Map</code>
-    *             if no parameters exist. The keys in the parameter
-    *             map are of type String. The values in the parameter map are of type
-    *             String array (<code>String[]</code>).
+    * @return an immutable <code>Map</code> containing parameter names as keys and parameter values as map values, or
+    *         an empty <code>Map</code> if no parameters exist. The keys in the parameter map are of type String. The
+    *         values in the parameter map are of type String array (<code>String[]</code>).
     */
-    Map getParameterMap();
+   Map getParameterMap();
 
    /**
-    * Returns a boolean indicating whether this request was made
-    * using a secure channel between client and the portal, such as HTTPS.
+    * Returns a boolean indicating whether this request was made using a secure channel between client and the portal,
+    * such as HTTPS.
     *
-    * @return  true, if the request was made using a secure channel.
+    * @return true, if the request was made using a secure channel.
     */
-    boolean isSecure();
+   boolean isSecure();
 
    /**
     * Stores an attribute in this request.
+    * <p/>
+    * <p>Attribute names should follow the same conventions as package names. Names beginning with <code>java.*</code>,
+    * <code>javax.*</code>, and <code>com.sun.*</code> are reserved for use by Sun Microsystems. <br> If the value
+    * passed into this method is <code>null</code>, the effect is the same as calling {@link #removeAttribute}.
     *
-    * <p>Attribute names should follow the same conventions as
-    * package names. Names beginning with <code>java.*</code>,
-    * <code>javax.*</code>, and <code>com.sun.*</code> are
-    * reserved for use by Sun Microsystems.
-    *<br> If the value passed into this method is <code>null</code>,
-    * the effect is the same as calling {@link #removeAttribute}.
-    *
-    *
-    * @param name			a <code>String</code> specifying
-    *					the name of the attribute
-    *
-    * @param o				the <code>Object</code> to be stored
-    *
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the name of the attribute
+    * @param o    the <code>Object</code> to be stored
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
     */
-    void setAttribute(String name, Object o) throws IllegalArgumentException;
+   void setAttribute(String name, Object o) throws IllegalArgumentException;
 
    /**
+    * Removes an attribute from this request.  This method is not generally needed, as attributes only persist as long
+    * as the request is being handled.
+    * <p/>
+    * <p>Attribute names should follow the same conventions as package names. Names beginning with <code>java.*</code>,
+    * <code>javax.*</code>, and <code>com.sun.*</code> are reserved for use by Sun Microsystems.
     *
-    * Removes an attribute from this request.  This method is not
-    * generally needed, as attributes only persist as long as the request
-    * is being handled.
-    *
-    * <p>Attribute names should follow the same conventions as
-    * package names. Names beginning with <code>java.*</code>,
-    * <code>javax.*</code>, and <code>com.sun.*</code> are
-    * reserved for use by Sun Microsystems.
-    *
-    * @param name			a <code>String</code> specifying
-    *					the name of the attribute to be removed
-    *
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name a <code>String</code> specifying the name of the attribute to be removed
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
     */
-    void removeAttribute(String name) throws IllegalArgumentException;
+   void removeAttribute(String name) throws IllegalArgumentException;
 
    /**
+    * Returns the session ID indicated in the client request. This session ID may not be a valid one, it may be an old
+    * one that has expired or has been invalidated. If the client request did not specify a session ID, this method
+    * returns <code>null</code>.
     *
-    * Returns the session ID indicated in the client request.
-    * This session ID may not be a valid one, it may be an old
-    * one that has expired or has been invalidated.
-    * If the client request
-    * did not specify a session ID, this method returns
-    * <code>null</code>.
-    *
-    * @return		a <code>String</code> specifying the session
-    *			ID, or <code>null</code> if the request did
-    *			not specify a session ID
-    *
-    * @see		#isRequestedSessionIdValid
-    *
+    * @return a <code>String</code> specifying the session ID, or <code>null</code> if the request did not specify a
+    * session ID
+    * @see      #isRequestedSessionIdValid
     */
-    String getRequestedSessionId();
+   String getRequestedSessionId();
 
    /**
-    *
     * Checks whether the requested session ID is still valid.
     *
-    * @return			<code>true</code> if this
-    *				request has an id for a valid session
-    *				in the current session context;
-    *				<code>false</code> otherwise
-    *
-    * @see			#getRequestedSessionId
-    * @see			#getPortletSession
+    * @return         <code>true</code> if this request has an id for a valid session in the current session context;
+    * <code>false</code> otherwise
+    * @see         #getRequestedSessionId
+    * @see         #getPortletSession
     */
-    boolean isRequestedSessionIdValid();
+   boolean isRequestedSessionIdValid();
 
    /**
     * Returns the portal preferred content type for the response.
-    * <p>
-    * The content type only includes the MIME type, not the
-    * character set.
-    * <p>
-    * Only content types that the portlet has defined in its
-    * deployment descriptor are valid return values for
-    * this method call. If the portlet has defined
-    * <code>'*'</code> or <code>'* / *'</code> as supported content
-    * types, these may also be valid return values.
+    * <p/>
+    * The content type only includes the MIME type, not the character set.
+    * <p/>
+    * Only content types that the portlet has defined in its deployment descriptor are valid return values for this
+    * method call. If the portlet has defined <code>'*'</code> or <code>'* / *'</code> as supported content types,
+    * these may also be valid return values.
     *
     * @return preferred MIME type of the response
     */
-    String getResponseContentType();
+   String getResponseContentType();
 
    /**
-    * Gets a list of content types which the portal accepts for the response.
-    * This list is ordered with the most preferable types listed first.
-    * <p>
-    * The content type only includes the MIME type, not the
-    * character set.
-    * <p>
-    * Only content types that the portlet has defined in its
-    * deployment descriptor are valid return values for
-    * this method call. If the portlet has defined
-    * <code>'*'</code> or <code>'* / *'</code> as supported content
-    * types, these may also be valid return values.
+    * Gets a list of content types which the portal accepts for the response. This list is ordered with the most
+    * preferable types listed first.
+    * <p/>
+    * The content type only includes the MIME type, not the character set.
+    * <p/>
+    * Only content types that the portlet has defined in its deployment descriptor are valid return values for this
+    * method call. If the portlet has defined <code>'*'</code> or <code>'* / *'</code> as supported content types,
+    * these may also be valid return values.
     *
     * @return ordered list of MIME types for the response
     */
-    Enumeration getResponseContentTypes();
+   Enumeration getResponseContentTypes();
 
    /**
-    * Returns the preferred Locale in which the portal will accept content.
-    * The Locale may be based on the Accept-Language header of the client.
+    * Returns the preferred Locale in which the portal will accept content. The Locale may be based on the
+    * Accept-Language header of the client.
     *
-    * @return  the prefered Locale in which the portal will accept content.
+    * @return the prefered Locale in which the portal will accept content.
     */
-    Locale getLocale();
+   Locale getLocale();
 
    /**
-    * Returns an Enumeration of Locale objects indicating, in decreasing
-    * order starting with the preferred locale in which the portal will
-    * accept content for this request.
-    * The Locales may be based on the Accept-Language header of the client.
+    * Returns an Enumeration of Locale objects indicating, in decreasing order starting with the preferred locale in
+    * which the portal will accept content for this request. The Locales may be based on the Accept-Language header of
+    * the client.
     *
-    * @return  an Enumeration of Locales, in decreasing order, in which
-    *           the portal will accept content for this request
+    * @return an Enumeration of Locales, in decreasing order, in which the portal will accept content for this request
     */
-    Enumeration getLocales();
+   Enumeration getLocales();
 
    /**
-    * Returns the name of the scheme used to make this request.
-    * For example, <code>http</code>, <code>https</code>, or <code>ftp</code>.
-    * Different schemes have different rules for constructing URLs,
-    * as noted in RFC 1738.
+    * Returns the name of the scheme used to make this request. For example, <code>http</code>, <code>https</code>, or
+    * <code>ftp</code>. Different schemes have different rules for constructing URLs, as noted in RFC 1738.
     *
-    * @return		a <code>String</code> containing the name
-    *			of the scheme used to make this request
+    * @return a <code>String</code> containing the name of the scheme used to make this request
     */
-    String getScheme();
+   String getScheme();
 
    /**
     * Returns the host name of the server that received the request.
     *
-    * @return		a <code>String</code> containing the name
-    *			of the server to which the request was sent
+    * @return a <code>String</code> containing the name of the server to which the request was sent
     */
-    String getServerName();
+   String getServerName();
 
    /**
     * Returns the port number on which this request was received.
     *
-    * @return		an integer specifying the port number
+    * @return an integer specifying the port number
     */
-    int getServerPort();
+   int getServerPort();
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequestDispatcher.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequestDispatcher.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletRequestDispatcher.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,36 +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 javax.portlet;
 
 import java.io.IOException;
 
 /**
- * The <code>PortletRequestDispatcher</code> interface
- * defines an object that receives requests from the client
- * and sends them to the specified resources (such as a servlet,
- * HTML file, or JSP file) on the server. The portlet
- * container creates the <code>PortletRequestDispatcher</code> object,
- * which is used as a wrapper around a server resource located
- * at a particular path or given by a particular name.
+ * The <code>PortletRequestDispatcher</code> interface defines an object that receives requests from the client and
+ * sends them to the specified resources (such as a servlet, HTML file, or JSP file) on the server. The portlet
+ * container creates the <code>PortletRequestDispatcher</code> object, which is used as a wrapper around a server
+ * resource located at a particular path or given by a particular name.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -38,28 +36,17 @@
 public interface PortletRequestDispatcher
 {
    /**
-    *
-    * Includes the content of a resource (servlet, JSP page,
-    * HTML file) in the response. In essence, this method enables
+    * Includes the content of a resource (servlet, JSP page, HTML file) in the response. In essence, this method enables
     * programmatic server-side includes.
-    * <p>
-    * The included servlet cannot set or change the response status code
-    * or set headers; any attempt to make a change is ignored.
+    * <p/>
+    * The included servlet cannot set or change the response status code or set headers; any attempt to make a change is
+    * ignored.
     *
-    *
-    * @param request 			a {@link RenderRequest} object
-    *					that contains the client request
-    *
-    * @param response 			a {@link RenderResponse} object
-    * 					that contains the render response
-    *
-    * @exception PortletException 	if the included resource throws a ServletException,
-    *                                  or other exceptions that are not Runtime-
-    *                                  or IOExceptions.
-    *
-    * @exception java.io.IOException	if the included resource throws this exception
-    *
-    *
+    * @param request  a {@link RenderRequest} object that contains the client request
+    * @param response a {@link RenderResponse} object that contains the render response
+    * @throws PortletException    if the included resource throws a ServletException, or other exceptions that are not
+    *                             Runtime- or IOExceptions.
+    * @throws java.io.IOException if the included resource throws this exception
     */
    void include(RenderRequest request, RenderResponse response) throws PortletException, IOException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,97 +1,83 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 /**
- * The <CODE>PortletResponse</CODE> defines the base interface to assist a
- * portlet in creating and sending a response to the client.
- * The portlet container uses two specialized versions of this interface
- * when invoking a portlet, <CODE>ActionResponse</CODE> and
- * <CODE>RenderResponse</CODE>. The  portlet container creates these
- * objects and passes them as arguments to the portlet's <CODE>processAction</CODE>
- * and <CODE>render</CODE> methods.
+ * The <CODE>PortletResponse</CODE> defines the base interface to assist a portlet in creating and sending a response to
+ * the client. The portlet container uses two specialized versions of this interface when invoking a portlet,
+ * <CODE>ActionResponse</CODE> and <CODE>RenderResponse</CODE>. The  portlet container creates these objects and passes
+ * them as arguments to the portlet's <CODE>processAction</CODE> and <CODE>render</CODE> methods.
  *
- * @see ActionResponse
- * @see RenderResponse
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see ActionResponse
+ * @see RenderResponse
  */
 public interface PortletResponse
 {
    /**
     * Adds a String property to an existing key to be returned to the portal.
-    * <p>
+    * <p/>
     * This method allows response properties to have multiple values.
-    * <p>
-    * Properties can be used by portlets to provide vendor specific
-    * information to the portal.
+    * <p/>
+    * Properties can be used by portlets to provide vendor specific information to the portal.
     *
-    * @param  key    the key of the property to be returned to the portal
-    * @param  value  the value of the property to be returned to the portal
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if key is <code>null</code>.
+    * @param key   the key of the property to be returned to the portal
+    * @param value the value of the property to be returned to the portal
+    * @throws java.lang.IllegalArgumentException
+    *          if key is <code>null</code>.
     */
    void addProperty(String key, String value) throws IllegalArgumentException;
 
    /**
     * Sets a String property to be returned to the portal.
-    * <p>
-    * Properties can be used by portlets to provide vendor specific
-    * information to the portal.
-    * <p>
+    * <p/>
+    * Properties can be used by portlets to provide vendor specific information to the portal.
+    * <p/>
     * This method resets all properties previously added with the same key.
     *
-    * @param  key    the key of the property to be returned to the portal
-    * @param  value  the value of the property to be returned to the portal
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if key is <code>null</code>.
+    * @param key   the key of the property to be returned to the portal
+    * @param value the value of the property to be returned to the portal
+    * @throws java.lang.IllegalArgumentException
+    *          if key is <code>null</code>.
     */
    void setProperty(String key, String value) throws IllegalArgumentException;
 
    /**
-    * Returns the encoded URL of the resource, like servlets,
-    * JSPs, images and other static files, at the given path.
-    * <p>
-    * Some portal/portlet-container implementation may require
-    * those URLs to contain implementation specific data encoded
-    * in it. Because of that, portlets should use this method to
-    * create such URLs.
-    * <p>
-    * The <code>encodeURL</code> method may include the session ID
-    * and other portal/portlet-container specific information into the URL.
-    * If encoding is not needed, it returns the URL unchanged.
+    * Returns the encoded URL of the resource, like servlets, JSPs, images and other static files, at the given path.
+    * <p/>
+    * Some portal/portlet-container implementation may require those URLs to contain implementation specific data
+    * encoded in it. Because of that, portlets should use this method to create such URLs.
+    * <p/>
+    * The <code>encodeURL</code> method may include the session ID and other portal/portlet-container specific
+    * information into the URL. If encoding is not needed, it returns the URL unchanged.
     *
-    * @param   path
-    *          the URI path to the resource. This must be either
-    *          an absolute URL (e.g.
-    *          <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
-    *          or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>).
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if path doesn't have a leading slash or is not an absolute URL
-    *
-    * @return   the encoded resource URL as string
+    * @param path the URI path to the resource. This must be either an absolute URL (e.g.
+    *             <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>) or a full path URI (e.g.
+    *             <code>/myportal/mywebap/myfolder/myresource.gif</code>).
+    * @return the encoded resource URL as string
+    * @throws java.lang.IllegalArgumentException
+    *          if path doesn't have a leading slash or is not an absolute URL
     */
    String encodeURL(String path) throws IllegalArgumentException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSecurityException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSecurityException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSecurityException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * A portlet should throw a <CODE>PortletSecurityException</CODE>
- * when a call fails because of security reasons.<br>
+ * A portlet should throw a <CODE>PortletSecurityException</CODE> when a call fails because of security reasons.<br>
  * Additionally it can be thrown by the portal/portlet-container.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -36,11 +36,10 @@
    private static final long serialVersionUID = 8583073199398660179L;
 
    /**
-    * Constructs a new security exception with the given text. The
-    * portlet container may use the text write it to a log.
+    * Constructs a new security exception with the given text. The portlet container may use the text write it to a
+    * log.
     *
-    * @param   text
-    *          the exception text
+    * @param text the exception text
     */
    public PortletSecurityException(String text)
    {
@@ -48,19 +47,12 @@
    }
 
    /**
-    * Constructs a new portlet security exception when the portlet needs to do
-    * the following:
-    * <ul>
-    * <il>throw an exception
-    * <li>include a message about the "root cause" that interfered
-    *     with its normal operation
-    * <li>include a description message
-    * </ul>
+    * Constructs a new portlet security exception when the portlet needs to do the following: <ul> <il>throw an
+    * exception <li>include a message about the "root cause" that interfered with its normal operation <li>include a
+    * description message </ul>
     *
-    * @param   text
-    *          the exception text
-    * @param   cause
-    *          the root cause
+    * @param text  the exception text
+    * @param cause the root cause
     */
    public PortletSecurityException(String text, Throwable cause)
    {
@@ -68,12 +60,10 @@
    }
 
    /**
-    * Constructs a new portlet security exception when the portlet needs to throw an
-    * exception. The exception message is based on the localized message
-    * of the underlying exception.
+    * Constructs a new portlet security exception when the portlet needs to throw an exception. The exception message is
+    * based on the localized message of the underlying exception.
     *
-    * @param   cause
-    *          the root cause
+    * @param cause the root cause
     */
    public PortletSecurityException(Throwable cause)
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSession.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSession.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSession.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,53 +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 javax.portlet;
 
 import java.util.Enumeration;
 
 /**
- * The <CODE>PortletSession</CODE> interface provides a way to identify a user
- * across more than one request and to store transient information about that user.
- * <p>
+ * The <CODE>PortletSession</CODE> interface provides a way to identify a user across more than one request and to store
+ * transient information about that user.
+ * <p/>
  * A <code>PortletSession</code> is created per user client per portlet application.
- * <p>
- * A portlet can bind an object attribute into a <code>PortletSession</code> by name.
- * The <code>PortletSession</code> interface defines two scopes for storing objects:
- * <ul>
- * <li><code>APPLICATION_SCOPE</code>
- * <li><code>PORTLET_SCOPE</code>
- * </ul>
- * All objects stored in the session using the <code>APPLICATION_SCOPE</code>
- * must be available to all the portlets, servlets and
- * JSPs that belongs to the same portlet application and that handles a
- * request identified as being a part of the same session.
- * Objects stored in the session using the <code>PORTLET_SCOPE</code> must be
- * available to the portlet during requests for the same portlet window
- * that the objects where stored from. Attributes stored in the
- * <code>PORTLET_SCOPE</code> are not protected from other web components
- * of the portlet application. They are just conveniently namespaced.
- * <P>
- * The portlet session is based on the <code>HttpSession</code>. Therefore all
- * <code>HttpSession</code> listeners do apply to the portlet session and
- * attributes set in the portlet session are visible in the <code>HttpSession</code>
+ * <p/>
+ * A portlet can bind an object attribute into a <code>PortletSession</code> by name. The <code>PortletSession</code>
+ * interface defines two scopes for storing objects: <ul> <li><code>APPLICATION_SCOPE</code>
+ * <li><code>PORTLET_SCOPE</code> </ul> All objects stored in the session using the <code>APPLICATION_SCOPE</code> must
+ * be available to all the portlets, servlets and JSPs that belongs to the same portlet application and that handles a
+ * request identified as being a part of the same session. Objects stored in the session using the
+ * <code>PORTLET_SCOPE</code> must be available to the portlet during requests for the same portlet window that the
+ * objects where stored from. Attributes stored in the <code>PORTLET_SCOPE</code> are not protected from other web
+ * components of the portlet application. They are just conveniently namespaced.
+ * <p/>
+ * The portlet session is based on the <code>HttpSession</code>. Therefore all <code>HttpSession</code> listeners do
+ * apply to the portlet session and attributes set in the portlet session are visible in the <code>HttpSession</code>
  * and vice versa.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -56,285 +49,215 @@
 public interface PortletSession
 {
    /**
-    * This constant defines an application wide scope for the session attribute.
-    * <code>APPLICATION_SCOPE</code> session attributes enable Portlets
-    * within one portlet application to share data.
-    * <p>
-    * Portlets may need to prefix attributes set in this scope with some
-    * ID, to avoid overwriting each other's attributes in the
-    * case where two portlets of the same portlet definition
-    * are created.
-    * <p>
+    * This constant defines an application wide scope for the session attribute. <code>APPLICATION_SCOPE</code> session
+    * attributes enable Portlets within one portlet application to share data.
+    * <p/>
+    * Portlets may need to prefix attributes set in this scope with some ID, to avoid overwriting each other's
+    * attributes in the case where two portlets of the same portlet definition are created.
+    * <p/>
     * Value: <code>0x01</code>
     */
    int APPLICATION_SCOPE = 0x01;
 
    /**
-    * This constant defines the scope of the session attribute to be
-    * private to the portlet and its included resources.
-    * <p>
+    * This constant defines the scope of the session attribute to be private to the portlet and its included resources.
+    * <p/>
     * Value: <code>0x02</code>
     */
    int PORTLET_SCOPE = 0x02;
 
    /**
-    * Returns the object bound with the specified name in this session
-    * under the <code>PORTLET_SCOPE</code>, or <code>null</code> if no
-    * object is bound under the name in that scope.
+    * Returns the object bound with the specified name in this session under the <code>PORTLET_SCOPE</code>, or
+    * <code>null</code> if no object is bound under the name in that scope.
     *
-    * @param name		a string specifying the name of the object
-    *
-    * @return			the object with the specified name for
-    *                            the <code>PORTLET_SCOPE</code>.
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on an
-    *					invalidated session.
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name a string specifying the name of the object
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on an invalidated session.
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return the object with the specified name for the <code>PORTLET_SCOPE</code>.
     */
    Object getAttribute(String name) throws IllegalStateException, IllegalArgumentException;
 
    /**
-    * Returns the object bound with the specified name in this session,
-    * or <code>null</code> if no object is bound under the name in the given scope.
+    * Returns the object bound with the specified name in this session, or <code>null</code> if no object is bound under
+    * the name in the given scope.
     *
-    * @param name		a string specifying the name of the object
-    * @param scope               session scope of this attribute
-    *
-    * @return			the object with the specified name
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on an
-    *					invalidated session
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name  a string specifying the name of the object
+    * @param scope session scope of this attribute
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on an invalidated session
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
+    * @return the object with the specified name
     */
    Object getAttribute(String name, int scope) throws IllegalStateException, IllegalArgumentException;
 
    /**
-    * Returns an <code>Enumeration</code> of String objects containing the names of
-    * all the objects bound to this session under the <code>PORTLET_SCOPE</code>, or an
-    * empty <code>Enumeration</code> if no attributes are available.
+    * Returns an <code>Enumeration</code> of String objects containing the names of all the objects bound to this
+    * session under the <code>PORTLET_SCOPE</code>, or an empty <code>Enumeration</code> if no attributes are
+    * available.
     *
-    * @return			an <code>Enumeration</code> of
-    *				<code>String</code> objects specifying the
-    *				names of all the objects bound to
-    *				this session, or an empty <code>Enumeration</code>
-    *                if no attributes are available.
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on an
-    *					invalidated session
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on an invalidated session
+    * @return an <code>Enumeration</code> of <code>String</code> objects specifying the names of all the objects bound
+    * to this session, or an empty <code>Enumeration</code> if no attributes are available.
     */
    Enumeration getAttributeNames() throws IllegalStateException;
 
    /**
-    * Returns an <code>Enumeration</code> of String objects containing the names of
-    * all the objects bound to this session in the given scope, or an
-    * empty <code>Enumeration</code> if no attributes are available in the
-    * given scope.
+    * Returns an <code>Enumeration</code> of String objects containing the names of all the objects bound to this
+    * session in the given scope, or an empty <code>Enumeration</code> if no attributes are available in the given
+    * scope.
     *
-    * @param scope               session scope of the attribute names
-    *
-    * @return			an <code>Enumeration</code> of
-    *				<code>String</code> objects specifying the
-    *				names of all the objects bound to
-    *				this session, or an empty <code>Enumeration</code>
-    *                            if no attributes are available in the given scope.
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on an
-    *					invalidated session
+    * @param scope session scope of the attribute names
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on an invalidated session
+    * @return an <code>Enumeration</code> of <code>String</code> objects specifying the names of all the objects bound
+    * to this session, or an empty <code>Enumeration</code> if no attributes are available in the given scope.
     */
    Enumeration getAttributeNames(int scope) throws IllegalStateException;
 
    /**
-    * Returns the time when this session was created, measured in
-    * milliseconds since midnight January 1, 1970 GMT.
+    * Returns the time when this session was created, measured in milliseconds since midnight January 1, 1970 GMT.
     *
-    * @return				a <code>long</code> specifying
-    * 					when this session was created,
-    *					expressed in
-    *					milliseconds since 1/1/1970 GMT
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on an
-    *					invalidated session
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on an invalidated session
+    * @return a <code>long</code> specifying when this session was created, expressed in milliseconds since 1/1/1970
+    * GMT
     */
    long getCreationTime() throws IllegalStateException;
 
    /**
     * Returns a string containing the unique identifier assigned to this session.
     *
-    * @return				a string specifying the identifier
-    *					assigned to this session
+    * @return a string specifying the identifier assigned to this session
     */
    String getId();
 
    /**
-    * Returns the last time the client sent a request associated with this session,
-    * as the number of milliseconds since midnight January 1, 1970 GMT.
+    * Returns the last time the client sent a request associated with this session, as the number of milliseconds since
+    * midnight January 1, 1970 GMT.
+    * <p/>
+    * <p>Actions that your portlet takes, such as getting or setting a value associated with the session, do not affect
+    * the access time.
     *
-    * <p>Actions that your portlet takes, such as getting or setting
-    * a value associated with the session, do not affect the access
-    * time.
-    *
-    * @return				a <code>long</code>
-    *					representing the last time
-    *					the client sent a request associated
-    *					with this session, expressed in
-    *					milliseconds since 1/1/1970 GMT
+    * @return a <code>long</code> representing the last time the client sent a request associated with this session,
+    * expressed in milliseconds since 1/1/1970 GMT
     */
    long getLastAccessedTime();
 
    /**
-    * Returns the maximum time interval, in seconds, for which the portlet container
-    * keeps this session open between client accesses. After this interval,
-    * the portlet container invalidates the session.  The maximum time
-    * interval can be set
-    * with the <code>setMaxInactiveInterval</code> method.
-    * A negative time indicates the session should never timeout.
+    * Returns the maximum time interval, in seconds, for which the portlet container keeps this session open between
+    * client accesses. After this interval, the portlet container invalidates the session.  The maximum time interval
+    * can be set with the <code>setMaxInactiveInterval</code> method. A negative time indicates the session should never
+    * timeout.
     *
-    * @return		an integer specifying the number of
-    *			seconds this session remains open
-    *			between client requests
-    *
-    * @see		#setMaxInactiveInterval
+    * @return an integer specifying the number of seconds this session remains open between client requests
+    * @see      #setMaxInactiveInterval
     */
    int getMaxInactiveInterval();
 
    /**
     * Returns the portlet application context associated with this session.
     *
-    * @return   the portlet application context
+    * @return the portlet application context
     */
    PortletContext getPortletContext();
 
    /**
     * Invalidates this session (all scopes) and unbinds any objects bound to it.
-    * <p>
-    * Invalidating the portlet session will result in invalidating the underlying
-    * <code>HttpSession</code>
+    * <p/>
+    * Invalidating the portlet session will result in invalidating the underlying <code>HttpSession</code>
     *
-    * @exception java.lang.IllegalStateException	if this method is called on a
-    *					session which has already been invalidated
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on a session which has already been invalidated
     */
    void invalidate() throws IllegalStateException;
 
    /**
-    * Returns true if the client does not yet know about the session or
-    * if the client chooses not to join the session.
+    * Returns true if the client does not yet know about the session or if the client chooses not to join the session.
     *
-    * @return 				<code>true</code> if the
-    *					server has created a session,
-    *					but the client has not joined yet.
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on a
-    *					session which has already been invalidated
-    *
+    * @return <code>true</code> if the server has created a session, but the client has not joined yet.
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on a session which has already been invalidated
     */
    boolean isNew() throws IllegalStateException;
 
    /**
-    * Removes the object bound with the specified name under
-    * the <code>PORTLET_SCOPE</code> from
-    * this session. If the session does not have an object
-    * bound with the specified name, this method does nothing.
+    * Removes the object bound with the specified name under the <code>PORTLET_SCOPE</code> from this session. If the
+    * session does not have an object bound with the specified name, this method does nothing.
     *
-    * @param name   the name of the object to be
-    *               removed from this session in the
-    *               <code> PORTLET_SCOPE</code>.
-    *
-    * @exception java.lang.IllegalStateException
-    *                   if this method is called on a
-    *                   session which has been invalidated
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name the name of the object to be removed from this session in the <code> PORTLET_SCOPE</code>.
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on a session which has been invalidated
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
     */
    void removeAttribute(String name) throws IllegalStateException, IllegalArgumentException;
 
    /**
-    * Removes the object bound with the specified name and the given scope from
-    * this session. If the session does not have an object
-    * bound with the specified name, this method does nothing.
+    * Removes the object bound with the specified name and the given scope from this session. If the session does not
+    * have an object bound with the specified name, this method does nothing.
     *
-    * @param name   the name of the object to be
-    *               removed from this session
-    * @param scope  session scope of this attribute
-    *
-    * @exception java.lang.IllegalStateException
-    *                   if this method is called on a
-    *                   session which has been invalidated
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name  the name of the object to be removed from this session
+    * @param scope session scope of this attribute
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on a session which has been invalidated
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
     */
    void removeAttribute(String name, int scope) throws IllegalStateException, IllegalArgumentException;
 
    /**
-    * Binds an object to this session under the <code>PORTLET_SCOPE</code>, using the name specified.
-    * If an object of the same name in this scope is already bound to the session,
-    * that object is replaced.
+    * Binds an object to this session under the <code>PORTLET_SCOPE</code>, using the name specified. If an object of
+    * the same name in this scope is already bound to the session, that object is replaced.
+    * <p/>
+    * <p>After this method has been executed, and if the new object implements <code>HttpSessionBindingListener</code>,
+    * the container calls <code>HttpSessionBindingListener.valueBound</code>. The container then notifies any
+    * <code>HttpSessionAttributeListeners</code> in the web application. <p>If an object was already bound to this
+    * session that implements <code>HttpSessionBindingListener</code>, its <code>HttpSessionBindingListener.valueUnbound</code>
+    * method is called.
+    * <p/>
+    * <p>If the value is <code>null</code>, this has the same effect as calling <code>removeAttribute()</code>.
     *
-    * <p>After this method has been executed, and if the new object
-    * implements <code>HttpSessionBindingListener</code>,
-    * the container calls
-    * <code>HttpSessionBindingListener.valueBound</code>. The container then
-    * notifies any <code>HttpSessionAttributeListeners</code> in the web
-    * application.
-    * <p>If an object was already bound to this session
-    * that implements <code>HttpSessionBindingListener</code>, its
-    * <code>HttpSessionBindingListener.valueUnbound</code> method is called.
-    *
-    * <p>If the value is <code>null</code>, this has the same effect as calling
-    * <code>removeAttribute()</code>.
-    *
-    *
-    * @param name		the name to which the object is bound under
-    *                            the <code>PORTLET_SCOPE</code>;
-    *				this cannot be <code>null</code>.
-    * @param value		the object to be bound
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on a
-    *					session which has been invalidated
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name  the name to which the object is bound under the <code>PORTLET_SCOPE</code>; this cannot be
+    *              <code>null</code>.
+    * @param value the object to be bound
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on a session which has been invalidated
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
     */
    void setAttribute(String name, Object value) throws IllegalStateException, IllegalArgumentException;
 
    /**
-    * Binds an object to this session in the given scope, using the name specified.
-    * If an object of the same name in this scope is already bound to the session,
-    * that object is replaced.
+    * Binds an object to this session in the given scope, using the name specified. If an object of the same name in
+    * this scope is already bound to the session, that object is replaced.
+    * <p/>
+    * <p>After this method has been executed, and if the new object implements <code>HttpSessionBindingListener</code>,
+    * the container calls <code>HttpSessionBindingListener.valueBound</code>. The container then notifies any
+    * <code>HttpSessionAttributeListeners</code> in the web application. <p>If an object was already bound to this
+    * session that implements <code>HttpSessionBindingListener</code>, its <code>HttpSessionBindingListener.valueUnbound</code>
+    * method is called.
+    * <p/>
+    * <p>If the value is <code>null</code>, this has the same effect as calling <code>removeAttribute()</code>.
     *
-    * <p>After this method has been executed, and if the new object
-    * implements <code>HttpSessionBindingListener</code>,
-    * the container calls
-    * <code>HttpSessionBindingListener.valueBound</code>. The container then
-    * notifies any <code>HttpSessionAttributeListeners</code> in the web
-    * application.
-    * <p>If an object was already bound to this session
-    * that implements <code>HttpSessionBindingListener</code>, its
-    * <code>HttpSessionBindingListener.valueUnbound</code> method is called.
-    *
-    * <p>If the value is <code>null</code>, this has the same effect as calling
-    * <code>removeAttribute()</code>.
-    *
-    *
-    * @param name		the name to which the object is bound;
-    *				this cannot be <code>null</code>.
-    * @param value		the object to be bound
-    * @param scope               session scope of this attribute
-    *
-    * @exception java.lang.IllegalStateException	if this method is called on a
-    *					session which has been invalidated
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name is <code>null</code>.
+    * @param name  the name to which the object is bound; this cannot be <code>null</code>.
+    * @param value the object to be bound
+    * @param scope session scope of this attribute
+    * @throws java.lang.IllegalStateException
+    *          if this method is called on a session which has been invalidated
+    * @throws java.lang.IllegalArgumentException
+    *          if name is <code>null</code>.
     */
    void setAttribute(String name, Object value, int scope) throws IllegalStateException, IllegalArgumentException;
 
    /**
-    * Specifies the time, in seconds, between client requests, before the
-    * portlet container invalidates this session. A negative time
-    * indicates the session should never timeout.
+    * Specifies the time, in seconds, between client requests, before the portlet container invalidates this session. A
+    * negative time indicates the session should never timeout.
     *
-    * @param interval		An integer specifying the number
-    * 				of seconds
+    * @param interval An integer specifying the number of seconds
     */
    void setMaxInactiveInterval(int interval);
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSessionUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSessionUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletSessionUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>PortletSessionUtil</CODE>  class helps identify and decode
- * attributes in the <CODE>PORTLET_SCOPE</CODE> scope of the PortletSession
- * when accessed through the HttpSession an from within calls to methods
- * of the HttpSessionBindingListener interface.
+ * The <CODE>PortletSessionUtil</CODE>  class helps identify and decode attributes in the <CODE>PORTLET_SCOPE</CODE>
+ * scope of the PortletSession when accessed through the HttpSession an from within calls to methods of the
+ * HttpSessionBindingListener interface.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -34,14 +34,11 @@
 {
 
    /**
-    * Returns the attribute name of an attribute in the
-    * <code>PORTLET_SCOPE</code>. If the attribute is in the
+    * Returns the attribute name of an attribute in the <code>PORTLET_SCOPE</code>. If the attribute is in the
     * <code>APPLICATION_SCOPE</code> it returns the attribute name unchanged.
     *
-    * @param name		a string specifying the name of the
-    *                            encoded portlet attribute
-    *
-    * @return			the decoded attribute name
+    * @param name a string specifying the name of the encoded portlet attribute
+    * @return the decoded attribute name
     */
    public static String decodeAttributeName(String name)
    {
@@ -54,18 +51,11 @@
    }
 
    /**
-    * Returns the portlet attribute scope from an encoded portlet
-    * attribute.
-    * <br>Possible return values are:
-    * <ul>
-    * <li><code>PortletSession.APPLICATION_SCOPE</code></li>
-    * <li><code>PortletSession.PORTLET_SCOPE</code></li>
-    * </ul>
+    * Returns the portlet attribute scope from an encoded portlet attribute. <br>Possible return values are: <ul>
+    * <li><code>PortletSession.APPLICATION_SCOPE</code></li> <li><code>PortletSession.PORTLET_SCOPE</code></li> </ul>
     *
-    * @param name		a string specifying the name of the
-    *                            encoded portlet attribute
-    *
-    * @return			the decoded attribute scope
+    * @param name a string specifying the name of the encoded portlet attribute
+    * @return the decoded attribute scope
     * @see PortletSession
     */
    public static int decodeScope(String name)

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletURL.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PortletURL.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,50 +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 javax.portlet;
 
 import java.util.Map;
 
 /**
- * The <CODE>PortletURL</CODE> interface represents a URL
- * that reference the portlet itself.
- * <p>
- * A PortletURL is created through the <CODE>RenderResponse</CODE>.
- * Parameters, a portlet mode, a window state and a security level
- * can be added to <CODE>PortletURL</CODE> objects. The PortletURL
- * must be converted to a String in order to embed it into
- * the markup generated by the portlet.
- * <P>
- * There are two types of PortletURLs:
- * <ul>
- * <li>Action URLs, they are created with <CODE>RenderResponse.createActionURL</CODE>, and
- *     trigger an action request followed by a render request.
- * <li>Render URLs, they are created with <CODE>RenderResponse.createRenderURL</CODE>, and
- *     trigger a render request.
- * </ul>
- * <p>
- * The string reprensentation of a PortletURL does not need to be a valid
- * URL at the time the portlet is generating its content. It may contain
- * special tokens that will be converted to a valid URL, by the portal,
- * before the content is returned to the client.
+ * The <CODE>PortletURL</CODE> interface represents a URL that reference the portlet itself.
+ * <p/>
+ * A PortletURL is created through the <CODE>RenderResponse</CODE>. Parameters, a portlet mode, a window state and a
+ * security level can be added to <CODE>PortletURL</CODE> objects. The PortletURL must be converted to a String in order
+ * to embed it into the markup generated by the portlet.
+ * <p/>
+ * There are two types of PortletURLs: <ul> <li>Action URLs, they are created with
+ * <CODE>RenderResponse.createActionURL</CODE>, and trigger an action request followed by a render request. <li>Render
+ * URLs, they are created with <CODE>RenderResponse.createRenderURL</CODE>, and trigger a render request. </ul>
+ * <p/>
+ * The string reprensentation of a PortletURL does not need to be a valid URL at the time the portlet is generating its
+ * content. It may contain special tokens that will be converted to a valid URL, by the portal, before the content is
+ * returned to the client.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -53,143 +46,110 @@
 {
    /**
     * Sets the given String parameter to this URL.
-    * <p>
+    * <p/>
     * This method replaces all parameters with the given key.
-    * <p>
-    * The <code>PortletURL</code> implementation 'x-www-form-urlencoded' encodes
-    * all  parameter names and values. Developers should not encode them.
-    * <p>
-    * A portlet container may prefix the attribute names internally
-    * in order to preserve a unique namespace for the portlet.
+    * <p/>
+    * The <code>PortletURL</code> implementation 'x-www-form-urlencoded' encodes all  parameter names and values.
+    * Developers should not encode them.
+    * <p/>
+    * A portlet container may prefix the attribute names internally in order to preserve a unique namespace for the
+    * portlet.
     *
-    * @param   name
-    *          the parameter name
-    * @param   value
-    *          the parameter value
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name or value are <code>null</code>.
+    * @param name  the parameter name
+    * @param value the parameter value
+    * @throws java.lang.IllegalArgumentException
+    *          if name or value are <code>null</code>.
     */
    void setParameter(String name, String value) throws IllegalArgumentException;
 
    /**
     * Sets the given String array parameter to this URL.
-    * <p>
+    * <p/>
     * This method replaces all parameters with the given key.
-    * <p>
-    * The <code>PortletURL</code> implementation 'x-www-form-urlencoded' encodes
-    * all  parameter names and values. Developers should not encode them.
-    * <p>
-    * A portlet container may prefix the attribute names internally
-    * in order to preserve a unique namespace for the portlet.
+    * <p/>
+    * The <code>PortletURL</code> implementation 'x-www-form-urlencoded' encodes all  parameter names and values.
+    * Developers should not encode them.
+    * <p/>
+    * A portlet container may prefix the attribute names internally in order to preserve a unique namespace for the
+    * portlet.
     *
-    * @param   name
-    *          the parameter name
-    * @param   values
-    *          the parameter values
-    *
-    * @exception  java.lang.IllegalArgumentException
-    *                            if name or values are <code>null</code>.
+    * @param name   the parameter name
+    * @param values the parameter values
+    * @throws java.lang.IllegalArgumentException
+    *          if name or values are <code>null</code>.
     */
    void setParameter(String name, String[] values) throws IllegalArgumentException;
 
    /**
     * Sets a parameter map for this URL.
-    * <p>
+    * <p/>
     * All previously set parameters are cleared.
-    * <p>
-    * The <code>PortletURL</code> implementation 'x-www-form-urlencoded' encodes
-    * all  parameter names and values. Developers should not encode them.
-    * <p>
-    * A portlet container may prefix the attribute names internally,
-    * in order to preserve a unique namespace for the portlet.
+    * <p/>
+    * The <code>PortletURL</code> implementation 'x-www-form-urlencoded' encodes all  parameter names and values.
+    * Developers should not encode them.
+    * <p/>
+    * A portlet container may prefix the attribute names internally, in order to preserve a unique namespace for the
+    * portlet.
     *
-    * @param  parameters   Map containing parameter names for
-    *                      the render phase as
-    *                      keys and parameter values as map
-    *                      values. The keys in the parameter
-    *                      map must be of type String. The values
-    *                      in the parameter map must be of type
-    *                      String array (<code>String[]</code>).
-    *
-    * @exception	java.lang.IllegalArgumentException
-    *                      if parameters is <code>null</code>, if
-    *                      any of the key/values in the Map are <code>null</code>,
-    *                      if any of the keys is not a String, or if any of
-    *                      the values is not a String array.
+    * @param parameters Map containing parameter names for the render phase as keys and parameter values as map values.
+    *                   The keys in the parameter map must be of type String. The values in the parameter map must be of
+    *                   type String array (<code>String[]</code>).
+    * @exception java.lang.IllegalArgumentException if parameters is <code>null</code>, if any of the key/values in the
+    * Map are <code>null</code>, if any of the keys is not a String, or if any of the values is not a String array.
     */
    void setParameters(Map parameters) throws IllegalArgumentException;
 
    /**
-    * Indicates the portlet mode the portlet must be in, if this
-    * portlet URL triggers a request.
-    * <p>
-    * A URL can not have more than one portlet mode attached to it.
-    * If more than one portlet mode is set only the last one set
-    * is attached to the URL.
+    * Indicates the portlet mode the portlet must be in, if this portlet URL triggers a request.
+    * <p/>
+    * A URL can not have more than one portlet mode attached to it. If more than one portlet mode is set only the last
+    * one set is attached to the URL.
     *
-    * @param portletMode
-    *               the portlet mode
-    *
-    * @exception PortletModeException
-    *                   if the portlet cannot switch to this mode,
-    *                   because the portal does not support this mode, the portlet has not
-    *                   declared in its deployment descriptor that it supports this mode for the current markup,
-    *                   or the current user is not allowed to switch to this mode.
-    *                   The <code>PortletRequest.isPortletModeAllowed()</code> method can be used
-    *                   to check if the portlet can set a given portlet mode.
+    * @param portletMode the portlet mode
+    * @throws PortletModeException if the portlet cannot switch to this mode, because the portal does not support this
+    *                              mode, the portlet has not declared in its deployment descriptor that it supports this
+    *                              mode for the current markup, or the current user is not allowed to switch to this
+    *                              mode. The <code>PortletRequest.isPortletModeAllowed()</code> method can be used to
+    *                              check if the portlet can set a given portlet mode.
     * @see PortletRequest#isPortletModeAllowed
     */
    void setPortletMode(PortletMode portletMode) throws PortletModeException;
 
    /**
     * Indicated the security setting for this URL.
-    * <p>
-    * Secure set to <code>true</code> indicates that the portlet requests
-    * a secure connection between the client and the portlet window for
-    * this URL. Secure set to <code>false</code> indicates that the portlet
-    * does not need a secure connection for this URL. If the security is not
-    * set for a URL, it will stay the same as the current request.
+    * <p/>
+    * Secure set to <code>true</code> indicates that the portlet requests a secure connection between the client and the
+    * portlet window for this URL. Secure set to <code>false</code> indicates that the portlet does not need a secure
+    * connection for this URL. If the security is not set for a URL, it will stay the same as the current request.
     *
-    * @param  secure  true, if portlet requests to have a secure connection
-    *                 between its portlet window and the client; false, if
-    *                 the portlet does not require a secure connection.
-    *
-    * @throws PortletSecurityException  if the run-time environment does
-    *                                   not support the indicated setting
+    * @param secure true, if portlet requests to have a secure connection between its portlet window and the client;
+    *               false, if the portlet does not require a secure connection.
+    * @throws PortletSecurityException if the run-time environment does not support the indicated setting
     */
    void setSecure(boolean secure) throws PortletSecurityException;
 
    /**
-    * Indicates the window state the portlet should be in, if this
-    * portlet URL triggers a request.
-    * <p>
-    * A URL can not have more than one window state attached to it.
-    * If more than one window state is set only the last one set
-    * is attached to the URL.
+    * Indicates the window state the portlet should be in, if this portlet URL triggers a request.
+    * <p/>
+    * A URL can not have more than one window state attached to it. If more than one window state is set only the last
+    * one set is attached to the URL.
     *
-    * @param windowState
-    *               the portlet window state
-    *
-    * @exception WindowStateException
-    *                   if the portlet cannot switch to this state,
-    *                   because the portal does not support this state, the portlet has not
-    *                   declared in its deployment descriptor that it supports this state, or the current
-    *                   user is not allowed to switch to this state.
-    *                   The <code>PortletRequest.isWindowStateAllowed()</code> method can be used
-    *                   to check if the portlet can set a given window state.
+    * @param windowState the portlet window state
+    * @throws WindowStateException if the portlet cannot switch to this state, because the portal does not support this
+    *                              state, the portlet has not declared in its deployment descriptor that it supports
+    *                              this state, or the current user is not allowed to switch to this state. The
+    *                              <code>PortletRequest.isWindowStateAllowed()</code> method can be used to check if the
+    *                              portlet can set a given window state.
     * @see PortletRequest#isWindowStateAllowed
     */
    void setWindowState(WindowState windowState) throws WindowStateException;
 
    /**
-    * Returns the portlet URL string representation to be embedded in the
-    * markup.<br>
-    * Note that the returned String may not be a valid URL, as it may
-    * be rewritten by the portal/portlet-container before returning the
-    * markup to the client.
+    * Returns the portlet URL string representation to be embedded in the markup.<br> Note that the returned String may
+    * not be a valid URL, as it may be rewritten by the portal/portlet-container before returning the markup to the
+    * client.
     *
-    * @return   the encoded URL as a string
+    * @return the encoded URL as a string
     */
    String toString();
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PreferencesValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PreferencesValidator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/PreferencesValidator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>PreferencesValidator</CODE> allows to validate the set of
- * preferences of the associated portlet just before they are
- * stored in the persistent store.
- * <p>
- * The portlet container invokes the <code>validate</code> method as
- * part of the invocation of the <code>store</code> method of the
- * <code>PortletPreferences</code>.
+ * The <CODE>PreferencesValidator</CODE> allows to validate the set of preferences of the associated portlet just before
+ * they are stored in the persistent store.
+ * <p/>
+ * The portlet container invokes the <code>validate</code> method as part of the invocation of the <code>store</code>
+ * method of the <code>PortletPreferences</code>.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -36,14 +35,11 @@
 public interface PreferencesValidator
 {
    /**
-    * If the preferences values are successfully validated the call to this method
-    * must finish gracefully. Otherwise it must throw a <code>ValidatorException</code>.
+    * If the preferences values are successfully validated the call to this method must finish gracefully. Otherwise it
+    * must throw a <code>ValidatorException</code>.
     *
-    * @param  preferences   preferences to validate
-    *
-    * @throws  ValidatorException  if the given preferences contains invalid
-    *                              settings
-    *
+    * @param preferences preferences to validate
+    * @throws ValidatorException if the given preferences contains invalid settings
     */
    void validate(PortletPreferences preferences) throws ValidatorException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ReadOnlyException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ReadOnlyException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ReadOnlyException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>ReadOnlyException</CODE> is thrown when a portlet tries
- * to change the value for a read-only preference attribute.
+ * The <CODE>ReadOnlyException</CODE> is thrown when a portlet tries to change the value for a read-only preference
+ * attribute.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -35,11 +36,10 @@
    private static final long serialVersionUID = -5825945164244814308L;
 
    /**
-    * Constructs a new read-only exception with the given text. The
-    * portlet container may use the text write it to a log.
+    * Constructs a new read-only exception with the given text. The portlet container may use the text write it to a
+    * log.
     *
-    * @param   text
-    *          the exception text
+    * @param text the exception text
     */
    public ReadOnlyException(String text)
    {
@@ -47,19 +47,12 @@
    }
 
    /**
-    * Constructs a new read-only exception when the portlet needs to do
-    * the following:
-    * <ul>
-    * <il>throw an exception
-    * <li>include a message about the "root cause" that interfered
-    *     with its normal operation
-    * <li>include a description message
-    * </ul>
+    * Constructs a new read-only exception when the portlet needs to do the following: <ul> <il>throw an exception
+    * <li>include a message about the "root cause" that interfered with its normal operation <li>include a description
+    * message </ul>
     *
-    * @param   text
-    *          the exception text
-    * @param   cause
-    *          the root cause
+    * @param text  the exception text
+    * @param cause the root cause
     */
    public ReadOnlyException(String text, Throwable cause)
    {
@@ -67,12 +60,10 @@
    }
 
    /**
-    * Constructs a new read-only exception when the portlet needs to throw an
-    * exception. The exception message is based on the localized message
-    * of the underlying exception.
+    * Constructs a new read-only exception when the portlet needs to throw an exception. The exception message is based
+    * on the localized message of the underlying exception.
     *
-    * @param   cause
-    *          the root cause
+    * @param cause the root cause
     */
    public ReadOnlyException(Throwable cause)
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>RenderRequest</CODE> represents the request sent to the portlet
- * to handle a render.
- * It extends the PortletRequest interface to provide render request
- * information to portlets.<br>
- * The portlet container creates a <CODE>RenderRequest</CODE> object and
- * passes it as argument to the portlet's <CODE>render</CODE> method.
+ * The <CODE>RenderRequest</CODE> represents the request sent to the portlet to handle a render. It extends the
+ * PortletRequest interface to provide render request information to portlets.<br> The portlet container creates a
+ * <CODE>RenderRequest</CODE> object and passes it as argument to the portlet's <CODE>render</CODE> method.
  *
- * @see PortletRequest
- * @see ActionRequest
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see PortletRequest
+ * @see ActionRequest
  */
 public interface RenderRequest extends PortletRequest
 {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/RenderResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.io.IOException;
@@ -27,152 +28,123 @@
 import java.util.Locale;
 
 /**
- * The <CODE>RenderResponse</CODE> defines an object to assist a portlet in
- * sending a response to the portal.
- * It extends the <CODE>PortletResponse</CODE> interface to provide specific
- * render response functionality to portlets.<br>
- * The portlet container creates a <CODE>RenderResponse</CODE> object and
- * passes it as argument to the portlet's <CODE>render</CODE> method.
+ * The <CODE>RenderResponse</CODE> defines an object to assist a portlet in sending a response to the portal. It extends
+ * the <CODE>PortletResponse</CODE> interface to provide specific render response functionality to portlets.<br> The
+ * portlet container creates a <CODE>RenderResponse</CODE> object and passes it as argument to the portlet's
+ * <CODE>render</CODE> method.
  *
- * @see RenderRequest
- * @see PortletResponse
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
+ * @see RenderRequest
+ * @see PortletResponse
  */
 public interface RenderResponse extends PortletResponse
 {
    /**
-    * Property to set the expiration time in seconds for this
-    * response using the <code>setProperty</code> method.
-    * <P>
-    * If the expiration value is set to 0, caching is disabled
-    * for this portlet; if the value is set to -1,
-    * the cache does not expire.
-    * <p>
+    * Property to set the expiration time in seconds for this response using the <code>setProperty</code> method.
+    * <p/>
+    * If the expiration value is set to 0, caching is disabled for this portlet; if the value is set to -1, the cache
+    * does not expire.
+    * <p/>
     * The value is <code>"portlet.expiration-cache"</code>.
     */
    public static final String EXPIRATION_CACHE = "portlet.expiration-cache";
 
    /**
-    * Returns the MIME type that can be used to contribute
-    * markup to the render response.
-    * <p>
-    * If no content type was set previously using the {@link #setContentType} method
-    * this method retuns <code>null</code>.
+    * Returns the MIME type that can be used to contribute markup to the render response.
+    * <p/>
+    * If no content type was set previously using the {@link #setContentType} method this method retuns
+    * <code>null</code>.
     *
+    * @return the MIME type of the response, or <code>null</code> if no content type is set
     * @see #setContentType
-    *
-    * @return   the MIME type of the response, or <code>null</code>
-    *           if no content type is set
     */
 
    String getContentType();
 
    /**
-    * Creates a portlet URL targeting the portlet. If no portlet mode,
-    * window state or security modifier is set in the PortletURL the
-    * current values are preserved. If a request is triggered by the
-    * PortletURL, it results in a render request.
-    * <p>
-    * The returned URL can be further extended by adding
-    * portlet-specific parameters and portlet modes and window states.
-    * <p>
-    * The created URL will per default not contain any parameters
-    * of the current render request.
+    * Creates a portlet URL targeting the portlet. If no portlet mode, window state or security modifier is set in the
+    * PortletURL the current values are preserved. If a request is triggered by the PortletURL, it results in a render
+    * request.
+    * <p/>
+    * The returned URL can be further extended by adding portlet-specific parameters and portlet modes and window
+    * states.
+    * <p/>
+    * The created URL will per default not contain any parameters of the current render request.
     *
     * @return a portlet render URL
     */
    PortletURL createRenderURL();
 
    /**
-    * Creates a portlet URL targeting the portlet. If no portlet mode,
-    * window state or security modifier is set in the PortletURL the
-    * current values are preserved. If a request is triggered by the
-    * PortletURL, it results in an action request.
-    * <p>
-    * The returned URL can be further extended by adding
-    * portlet-specific parameters and portlet modes and window states.
-    * <p>
-    * The created URL will per default not contain any parameters
-    * of the current render request.
+    * Creates a portlet URL targeting the portlet. If no portlet mode, window state or security modifier is set in the
+    * PortletURL the current values are preserved. If a request is triggered by the PortletURL, it results in an action
+    * request.
+    * <p/>
+    * The returned URL can be further extended by adding portlet-specific parameters and portlet modes and window
+    * states.
+    * <p/>
+    * The created URL will per default not contain any parameters of the current render request.
     *
     * @return a portlet action URL
     */
    PortletURL createActionURL();
 
    /**
-    * The value returned by this method should be prefixed or appended to
-    * elements, such as JavaScript variables or function names, to ensure
-    * they are unique in the context of the portal page.
+    * The value returned by this method should be prefixed or appended to elements, such as JavaScript variables or
+    * function names, to ensure they are unique in the context of the portal page.
     *
-    * @return   the namespace
+    * @return the namespace
     */
    String getNamespace();
 
    /**
     * This method sets the title of the portlet.
-    * <p>
+    * <p/>
     * The value can be a text String
     *
-    * @param  title    portlet title as text String or resource URI
+    * @param title portlet title as text String or resource URI
     */
    void setTitle(String title);
 
    /**
-    * Sets the MIME type for the render response. The portlet must
-    * set the content type before calling {@link #getWriter} or
-    * {@link #getPortletOutputStream}.
-    * <p>
-    * Calling <code>setContentType</code> after <code>getWriter</code>
-    * or <code>getOutputStream</code> does not change the content type.
+    * Sets the MIME type for the render response. The portlet must set the content type before calling {@link
+    * #getWriter} or {@link #getPortletOutputStream}.
+    * <p/>
+    * Calling <code>setContentType</code> after <code>getWriter</code> or <code>getOutputStream</code> does not change
+    * the content type.
     *
-    * @param   type  the content MIME type
-    *
-    * @throws  java.lang.IllegalArgumentException
-    *              if the given type is not in the list returned
-    *              by <code>PortletRequest.getResponseContentTypes</code>
-    *
-    * @see  RenderRequest#getResponseContentTypes
-    * @see  #getContentType
+    * @param type the content MIME type
+    * @throws java.lang.IllegalArgumentException
+    *          if the given type is not in the list returned by <code>PortletRequest.getResponseContentTypes</code>
+    * @see RenderRequest#getResponseContentTypes
+    * @see #getContentType
     */
    void setContentType(String type) throws IllegalArgumentException;
 
    /**
-    * Returns the name of the charset used for
-    * the MIME body sent in this response.
+    * Returns the name of the charset used for the MIME body sent in this response.
+    * <p/>
+    * <p>See <a href="http://ds.internic.net/rfc/rfc2045.txt">RFC 2047</a> for more information about character encoding
+    * and MIME.
     *
-    * <p>See <a href="http://ds.internic.net/rfc/rfc2045.txt">RFC 2047</a>
-    * for more information about character encoding and MIME.
-    *
-    * @return		a <code>String</code> specifying the
-    *			name of the charset, for
-    *			example, <code>ISO-8859-1</code>
-    *
+    * @return a <code>String</code> specifying the name of the charset, for example, <code>ISO-8859-1</code>
     */
    String getCharacterEncoding();
 
    /**
-    * Returns a PrintWriter object that can send character
-    * text to the portal.
-    * <p>
-    * Before calling this method the content type of the
-    * render response must be set using the {@link #setContentType}
+    * Returns a PrintWriter object that can send character text to the portal.
+    * <p/>
+    * Before calling this method the content type of the render response must be set using the {@link #setContentType}
     * method.
-    * <p>
-    * Either this method or {@link #getPortletOutputStream} may be
-    * called to write the body, not both.
+    * <p/>
+    * Either this method or {@link #getPortletOutputStream} may be called to write the body, not both.
     *
-    * @return    a <code>PrintWriter</code> object that
-    *		can return character data to the portal
-    *
-    * @exception  java.io.IOException
-    *                 if an input or output exception occurred
-    * @exception  java.lang.IllegalStateException
-    *                 if the <code>getPortletOutputStream</code> method
-    * 		     has been called on this response,
-    *                 or if no content type was set using the
-    *                 <code>setContentType</code> method.
-    *
+    * @return a <code>PrintWriter</code> object that can return character data to the portal
+    * @throws java.io.IOException if an input or output exception occurred
+    * @throws java.lang.IllegalStateException
+    *                             if the <code>getPortletOutputStream</code> method has been called on this response, or
+    *                             if no content type was set using the <code>setContentType</code> method.
     * @see #setContentType
     * @see #getPortletOutputStream
     */
@@ -181,126 +153,103 @@
    /**
     * Returns the locale assigned to the response.
     *
-    * @return  Locale of this response
+    * @return Locale of this response
     */
    Locale getLocale();
 
    /**
-    * Sets the preferred buffer size for the body of the response.
-    * The portlet container will use a buffer at least as large as
-    * the size requested.
-    * <p>
-    * This method must be called before any response body content is
-    * written; if content has been written, or the portlet container
-    * does not support buffering, this method may throw an
-    * <code>IllegalStateException</code>.
+    * Sets the preferred buffer size for the body of the response. The portlet container will use a buffer at least as
+    * large as the size requested.
+    * <p/>
+    * This method must be called before any response body content is written; if content has been written, or the
+    * portlet container does not support buffering, this method may throw an <code>IllegalStateException</code>.
     *
-    * @param size 	the preferred buffer size
-    *
-    * @exception  java.lang.IllegalStateException
-    *                    if this method is called after
-    *			content has been written, or the
-    *                    portlet container does not support buffering
-    *
-    * @see 		#getBufferSize
-    * @see 		#flushBuffer
-    * @see 		#isCommitted
-    * @see 		#reset
+    * @param size the preferred buffer size
+    * @throws java.lang.IllegalStateException
+    *          if this method is called after content has been written, or the portlet container does not support
+    *          buffering
+    * @see #getBufferSize
+    * @see #flushBuffer
+    * @see #isCommitted
+    * @see #reset
     */
    void setBufferSize(int size) throws IllegalStateException;
 
    /**
-    * Returns the actual buffer size used for the response.  If no buffering
-    * is used, this method returns 0.
+    * Returns the actual buffer size used for the response.  If no buffering is used, this method returns 0.
     *
-    * @return	 	the actual buffer size used
-    *
-    * @see 		#setBufferSize
-    * @see 		#flushBuffer
-    * @see 		#isCommitted
-    * @see 		#reset
+    * @return the actual buffer size used
+    * @see #setBufferSize
+    * @see #flushBuffer
+    * @see #isCommitted
+    * @see #reset
     */
    int getBufferSize();
 
    /**
-    * Forces any content in the buffer to be written to the client.  A call
-    * to this method automatically commits the response.
+    * Forces any content in the buffer to be written to the client.  A call to this method automatically commits the
+    * response.
     *
-    * @exception  java.io.IOException  if an error occured when writing the output
-    *
-    * @see 		#setBufferSize
-    * @see 		#getBufferSize
-    * @see 		#isCommitted
-    * @see 		#reset
+    * @throws java.io.IOException if an error occured when writing the output
+    * @see #setBufferSize
+    * @see #getBufferSize
+    * @see #isCommitted
+    * @see #reset
     */
    void flushBuffer() throws IOException;
 
    /**
-    * Clears the content of the underlying buffer in the response without
-    * clearing properties set. If the response has been committed,
-    * this method throws an <code>IllegalStateException</code>.
+    * Clears the content of the underlying buffer in the response without clearing properties set. If the response has
+    * been committed, this method throws an <code>IllegalStateException</code>.
     *
-    * @exception  IllegalStateException 	if this method is called after
-    *					response is comitted
-    *
-    * @see 		#setBufferSize
-    * @see 		#getBufferSize
-    * @see 		#isCommitted
-    * @see 		#reset
+    * @throws IllegalStateException if this method is called after response is comitted
+    * @see #setBufferSize
+    * @see #getBufferSize
+    * @see #isCommitted
+    * @see #reset
     */
    void resetBuffer() throws IllegalStateException;
 
    /**
-    * Returns a boolean indicating if the response has been
-    * committed.
+    * Returns a boolean indicating if the response has been committed.
     *
-    * @return		a boolean indicating if the response has been
-    *  		committed
-    *
-    * @see 		#setBufferSize
-    * @see 		#getBufferSize
-    * @see 		#flushBuffer
-    * @see 		#reset
+    * @return a boolean indicating if the response has been committed
+    * @see #setBufferSize
+    * @see #getBufferSize
+    * @see #flushBuffer
+    * @see #reset
     */
    boolean isCommitted();
 
    /**
-    * Clears any data that exists in the buffer as well as the properties set.
-    * If the response has been committed, this method throws an
-    * <code>IllegalStateException</code>.
+    * Clears any data that exists in the buffer as well as the properties set. If the response has been committed, this
+    * method throws an <code>IllegalStateException</code>.
     *
-    * @exception java.lang.IllegalStateException  if the response has already been
-    *                                   committed
-    *
-    * @see 		#setBufferSize
-    * @see 		#getBufferSize
-    * @see 		#flushBuffer
-    * @see 		#isCommitted
+    * @throws java.lang.IllegalStateException
+    *          if the response has already been committed
+    * @see #setBufferSize
+    * @see #getBufferSize
+    * @see #flushBuffer
+    * @see #isCommitted
     */
    void reset() throws IllegalStateException;
 
    /**
-    * Returns a <code>OutputStream</code> suitable for writing binary
-    * data in the response. The portlet container does not encode the
-    * binary data.
-    * <p>
-    * Before calling this method the content type of the
-    * render response must be set using the {@link #setContentType}
+    * Returns a <code>OutputStream</code> suitable for writing binary data in the response. The portlet container does
+    * not encode the binary data.
+    * <p/>
+    * Before calling this method the content type of the render response must be set using the {@link #setContentType}
     * method.
-    * <p>
+    * <p/>
     * Calling <code>flush()</code> on the OutputStream commits the response.
-    * <p>
+    * <p/>
     * Either this method or {@link #getWriter} may be called to write the body, not both.
     *
-    * @return	a <code>OutputStream</code> for writing binary data
-    *
-    * @exception java.lang.IllegalStateException   if the <code>getWriter</code> method
-    * 					has been called on this response, or
-    *                                    if no content type was set using the
-    *                                    <code>setContentType</code> method.
-    *
-    * @exception java.io.IOException 	if an input or output exception occurred
-    *
+    * @throws java.lang.IllegalStateException
+    *                             if the <code>getWriter</code> method has been called on this response, or if no
+    *                             content type was set using the <code>setContentType</code> method.
+    * @throws java.io.IOException if an input or output exception occurred
+    * @return a <code>OutputStream</code> for writing binary data
     * @see #setContentType
     * @see #getWriter
     */

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/UnavailableException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/UnavailableException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/UnavailableException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The portlet should throw the <CODE>UnavailableException</CODE> when
- * the portlet is either temporarily or permanently unavailable to handle requests.
+ * The portlet should throw the <CODE>UnavailableException</CODE> when the portlet is either temporarily or permanently
+ * unavailable to handle requests.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -33,19 +34,14 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -7461927853991648173L;
-   
+
    private boolean permanent;
    private int unavailableSeconds;
 
    /**
+    * Constructs a new exception with a descriptive message indicating that the portlet is permanently unavailable.
     *
-    * Constructs a new exception with a descriptive
-    * message indicating that the portlet is permanently
-    * unavailable.
-    *
-    * @param text 	a <code>String</code> specifying the
-    *                  descriptive message
-    *
+    * @param text a <code>String</code> specifying the descriptive message
     */
    public UnavailableException(String text)
    {
@@ -55,25 +51,18 @@
    }
 
    /**
-    * Constructs a new exception with a descriptive message
-    * indicating that the portlet is temporarily unavailable
-    * and giving an estimate of how long it will be unavailable.
+    * Constructs a new exception with a descriptive message indicating that the portlet is temporarily unavailable and
+    * giving an estimate of how long it will be unavailable.
+    * <p/>
+    * <p>In some cases, the portlet cannot make an estimate. For example, the portlet might know that a server it needs
+    * is not running, but it might not be able to report how long it will take to be restored to functionality. This can
+    * be indicated with a negative or zero value for the <code>seconds</code> argument.
     *
-    * <p>In some cases, the portlet cannot make an estimate. For
-    * example, the portlet might know that a server it needs is
-    * not running, but it might not be able to report how long it will take
-    * to be restored to functionality. This can be indicated with
-    * a negative or zero value for the <code>seconds</code> argument.
-    *
-    * @param text	a <code>String</code> specifying the
-    *                  descriptive message. This message can be written
-    *                  to a log file or displayed for the user.
-    *
-    * @param unavailableSeconds	an integer specifying the number of seconds
-    * 			for which the portlet expects to be unavailable; if
-    *			this is zero or negative, it indicates that the portlet
-    *			cannot make an estimate.
-    *
+    * @param text               a <code>String</code> specifying the descriptive message. This message can be written to
+    *                           a log file or displayed for the user.
+    * @param unavailableSeconds an integer specifying the number of seconds for which the portlet expects to be
+    *                           unavailable; if this is zero or negative, it indicates that the portlet cannot make an
+    *                           estimate.
     */
    public UnavailableException(String text, int unavailableSeconds)
    {
@@ -83,23 +72,16 @@
    }
 
    /**
-    * Returns the time in seconds for which the portlet can be expected to
-    * be unavailable.
-    * <p>
-    * If the portlet is called again while it is still unavailable, it
-    * indicates the same time estimate. No effort is
-    * made to correct for the time elapsed since the exception was
-    * first reported.
-    * <p>
-    * If this method returns zero or a negative number, the portlet
-    * is permanently unavailable or cannot provide an estimate of
-    * how long it will be unavailable.
+    * Returns the time in seconds for which the portlet can be expected to be unavailable.
+    * <p/>
+    * If the portlet is called again while it is still unavailable, it indicates the same time estimate. No effort is
+    * made to correct for the time elapsed since the exception was first reported.
+    * <p/>
+    * If this method returns zero or a negative number, the portlet is permanently unavailable or cannot provide an
+    * estimate of how long it will be unavailable.
     *
-    * @return		an integer specifying the number of seconds
-    *			the portlet will be temporarily unavailable,
-    *			or zero or a negative number if the portlet is permanently
-    *			unavailable or cannot make an estimate.
-    *
+    * @return an integer specifying the number of seconds the portlet will be temporarily unavailable, or zero or a
+    * negative number if the portlet is permanently unavailable or cannot make an estimate.
     */
    public int getUnavailableSeconds()
    {
@@ -107,17 +89,11 @@
    }
 
    /**
+    * Returns a <code>boolean</code> indicating whether the portlet is permanently unavailable. If so, something is
+    * wrong with the portlet, and the system administrator must take some corrective action.
     *
-    * Returns a <code>boolean</code> indicating
-    * whether the portlet is permanently unavailable.
-    * If so, something is wrong with the portlet, and the
-    * system administrator must take some corrective action.
-    *
-    * @return		<code>true</code> if the portlet is
-    *			permanently unavailable; <code>false</code>
-    *			if the portlet is temporarily
-    *			unavailable.
-    *
+    * @return      <code>true</code> if the portlet is permanently unavailable; <code>false</code> if the portlet is
+    * temporarily unavailable.
     */
    public boolean isPermanent()
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ValidatorException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ValidatorException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/ValidatorException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package javax.portlet;
 
 import java.util.Collection;
@@ -27,9 +28,8 @@
 import java.util.NoSuchElementException;
 
 /**
- * The <CODE>ValidatorException</CODE> is thrown by the
- * <CODE>validate</CODE> method of a PreferencesValidator when
- * the validation of a preference failed.
+ * The <CODE>ValidatorException</CODE> is thrown by the <CODE>validate</CODE> method of a PreferencesValidator when the
+ * validation of a preference failed.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -46,6 +46,7 @@
       {
          return false;
       }
+
       public Object nextElement()
       {
          throw new NoSuchElementException();
@@ -56,16 +57,14 @@
    private Enumeration failedKeysEnumeration;
 
    /**
-    * Constructs a new validator exception with the given text. The
-    * portlet container may use the text write it to a log.
-    * <p>
-    * The collection of failed keys may contain all failed keys, only the
-    * first key that failed validation, or may be <code>null</code>.
+    * Constructs a new validator exception with the given text. The portlet container may use the text write it to a
+    * log.
+    * <p/>
+    * The collection of failed keys may contain all failed keys, only the first key that failed validation, or may be
+    * <code>null</code>.
     *
-    * @param   text
-    *          the exception text
-    * @param   failedKeys
-    *          keys that failed the validation; may be <code>null</code>
+    * @param text       the exception text
+    * @param failedKeys keys that failed the validation; may be <code>null</code>
     */
    public ValidatorException(String text, Collection failedKeys)
    {
@@ -75,24 +74,16 @@
    }
 
    /**
-    * Constructs a new portlet validator exception.
-    * Used, when the portlet needs to do one of the following:
-    * <ul>
-    * <il>throw an exception
-    * <li>include a message about the "root cause" that interfered
-    *     with its normal operation
-    * <li>include a description message
-    * </ul>
-    * <p>
-    * The Collection of failed keys may contain all failed keys, only the
-    * first key that failed validation, or may be <code>null</code>.
+    * Constructs a new portlet validator exception. Used, when the portlet needs to do one of the following: <ul>
+    * <il>throw an exception <li>include a message about the "root cause" that interfered with its normal operation
+    * <li>include a description message </ul>
+    * <p/>
+    * The Collection of failed keys may contain all failed keys, only the first key that failed validation, or may be
+    * <code>null</code>.
     *
-    * @param   text
-    *          the exception text
-    * @param   cause
-    *          the root cause
-    * @param   failedKeys
-    *          keys that failed the validation; may be <code>null</code>
+    * @param text       the exception text
+    * @param cause      the root cause
+    * @param failedKeys keys that failed the validation; may be <code>null</code>
     */
    public ValidatorException(String text, Throwable cause, Collection failedKeys)
    {
@@ -101,17 +92,14 @@
    }
 
    /**
-    * Constructs a new portlet validator exception when the portlet needs to throw an
-    * exception. The exception message is based on the localized message
-    * of the underlying exception.
-    * <p>
-    * The Collection of failed keys may contain all failed keys, only the
-    * first key that failed validation, or may be <code>null</code>.
+    * Constructs a new portlet validator exception when the portlet needs to throw an exception. The exception message
+    * is based on the localized message of the underlying exception.
+    * <p/>
+    * The Collection of failed keys may contain all failed keys, only the first key that failed validation, or may be
+    * <code>null</code>.
     *
-    * @param   cause
-    *          the root cause
-    * @param   failedKeys
-    *          keys that failed the validation; may be <code>null</code>
+    * @param cause      the root cause
+    * @param failedKeys keys that failed the validation; may be <code>null</code>
     */
    public ValidatorException(Throwable cause, Collection failedKeys)
    {
@@ -121,13 +109,11 @@
 
    /**
     * Returns the keys that failed the validation.
-    * <p>
-    * The Enumeration of failed keys may contain all failed keys, only the
-    * first key that failed validation, or an empty
+    * <p/>
+    * The Enumeration of failed keys may contain all failed keys, only the first key that failed validation, or an empty
     * <code>Enumeration</code> if no failed keys are available.
     *
-    * @return  the keys that failed validation, or an empty
-    *          <code>Enumeration</code> if no failed keys are available.
+    * @return the keys that failed validation, or an empty <code>Enumeration</code> if no failed keys are available.
     */
    public Enumeration getFailedKeys()
    {
@@ -142,6 +128,7 @@
                {
                   return iterator.hasNext();
                }
+
                public Object nextElement()
                {
                   return iterator.next();

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowState.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowState.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>WindowState</CODE> class represents
- * the possible window states that a portlet window can assume.
- * <P>
- * This class defines a standard set of the most basic portlet window states.
- * Additional window states may be defined by calling the constructor of
- * this class. If a portal/portlet-container does not support a
- * custom window state defined in the portlet application deployment descriptor,
- * the custom window state will be ignored by the portal/portlet container.
+ * The <CODE>WindowState</CODE> class represents the possible window states that a portlet window can assume.
+ * <p/>
+ * This class defines a standard set of the most basic portlet window states. Additional window states may be defined by
+ * calling the constructor of this class. If a portal/portlet-container does not support a custom window state defined
+ * in the portlet application deployment descriptor, the custom window state will be ignored by the portal/portlet
+ * container.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -38,31 +37,27 @@
 {
 
    /**
-    * The <code>NORMAL</code> window state indicates that a portlet
-    * may be sharing the page with other portlets. It may also
-    * indicate that the target device has limited display capabilities.
-    * Therefore, a portlet should restrict the size of its rendered
-    * output in this window state.
-    * <p>
+    * The <code>NORMAL</code> window state indicates that a portlet may be sharing the page with other portlets. It may
+    * also indicate that the target device has limited display capabilities. Therefore, a portlet should restrict the
+    * size of its rendered output in this window state.
+    * <p/>
     * The string value for this state is <code>"normal"</code>.
     */
    public static final WindowState NORMAL = new WindowState("normal");
 
    /**
-    * When a portlet is in <code>MINIMIZED</code> window state,
-    * the portlet should only render minimal output or no output at all.
-    * <p>
+    * When a portlet is in <code>MINIMIZED</code> window state, the portlet should only render minimal output or no
+    * output at all.
+    * <p/>
     * The string value for this state is <code>"minimized"</code>.
     */
    public static final WindowState MINIMIZED = new WindowState("minimized");
 
    /**
-    * The <code>MAXIMIZED</code> window state is an indication
-    * that a portlet may be the only portlet being rendered in the
-    * portal page, or that the portlet has more space compared to other portlets
-    * in the portal page. A portlet may generate richer content
-    * when its window state is <code>MAXIMIZED</code>.
-    * <p>
+    * The <code>MAXIMIZED</code> window state is an indication that a portlet may be the only portlet being rendered in
+    * the portal page, or that the portlet has more space compared to other portlets in the portal page. A portlet may
+    * generate richer content when its window state is <code>MAXIMIZED</code>.
+    * <p/>
     * The string value for this state is <code>"maximized"</code>.
     */
    public static final WindowState MAXIMIZED = new WindowState("maximized");
@@ -71,9 +66,8 @@
 
    /**
     * Creates a new window state with the given name.
-    * <p>
-    * Upper case letters in the name are converted to
-    * lower case letters.
+    * <p/>
+    * Upper case letters in the name are converted to lower case letters.
     *
     * @param name The name of the portlet mode
     */
@@ -87,14 +81,11 @@
    }
 
    /**
-    * Compares the specified object with this window state
-    * for equality. Returns <code>true</code> if the
-    * Strings <code>equals</code> method for the String
-    * representing the two window states returns <code>true</code>.
+    * Compares the specified object with this window state for equality. Returns <code>true</code> if the Strings
+    * <code>equals</code> method for the String representing the two window states returns <code>true</code>.
     *
-    * @param   the window state to compare this window state with.
-    *
-    * @return  true, if the specified object is equal with this window state.
+    * @param the window state to compare this window state with.
+    * @return true, if the specified object is equal with this window state.
     */
    public boolean equals(Object o)
    {
@@ -106,11 +97,10 @@
    }
 
    /**
-    * Returns the hash code value for this window state.
-    * The hash code is constructed by producing the
-    * hash value of the String value of this window state.
+    * Returns the hash code value for this window state. The hash code is constructed by producing the hash value of the
+    * String value of this window state.
     *
-    * @return  hash code value for this window state
+    * @return hash code value for this window state
     */
    public int hashCode()
    {
@@ -118,10 +108,9 @@
    }
 
    /**
-    * Returns a String representation of this window state.
-    * Window state names are always lower case names.
+    * Returns a String representation of this window state. Window state names are always lower case names.
     *
-    * @return  String representation of this window state.
+    * @return String representation of this window state.
     */
    public String toString()
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowStateException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowStateException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/javax/portlet/WindowStateException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.portlet;
 
 /**
- * The <CODE>WindowStateException</CODE> is thrown when a portlet
- * tries to use a window state that is not supported by the current
- * runtime environment or the portlet.
+ * The <CODE>WindowStateException</CODE> is thrown when a portlet tries to use a window state that is not supported by
+ * the current runtime environment or the portlet.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -34,17 +34,15 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -7034467327478096995L;
-   
+
    private WindowState state;
 
    /**
-    * Constructs a new portlet state exception with the given text. The
-    * portlet container may use the text write it to a log.
+    * Constructs a new portlet state exception with the given text. The portlet container may use the text write it to a
+    * log.
     *
-    * @param   text
-    *          the exception text
-    * @param   state
-    *          the state causing the exception
+    * @param text  the exception text
+    * @param state the state causing the exception
     */
    public WindowStateException(String text, WindowState state)
    {
@@ -53,21 +51,13 @@
    }
 
    /**
-    * Constructs a new portlet state exception when the portlet needs to do
-    * the following:
-    * <ul>
-    * <il>throw an exception
-    * <li>include a message about the "root cause" that interfered
-    *     with its normal operation
-    * <li>include a description message
-    * </ul>
+    * Constructs a new portlet state exception when the portlet needs to do the following: <ul> <il>throw an exception
+    * <li>include a message about the "root cause" that interfered with its normal operation <li>include a description
+    * message </ul>
     *
-    * @param   text
-    *          the exception text
-    * @param   cause
-    *          the root cause
-    * @param   state
-    *          the state causing the exception
+    * @param text  the exception text
+    * @param cause the root cause
+    * @param state the state causing the exception
     */
    public WindowStateException(String text, Throwable cause, WindowState state)
    {
@@ -76,14 +66,11 @@
    }
 
    /**
-    * Constructs a new portlet state exception when the portlet needs to throw an
-    * exception. The exception message is based on the localized message
-    * of the underlying exception.
+    * Constructs a new portlet state exception when the portlet needs to throw an exception. The exception message is
+    * based on the localized message of the underlying exception.
     *
-    * @param   cause
-    *          the root cause
-    * @param   state
-    *          the state causing the exception
+    * @param cause the root cause
+    * @param state the state causing the exception
     */
    public WindowStateException(Throwable cause, WindowState state)
    {
@@ -94,7 +81,7 @@
    /**
     * Returns the portlet state causing this exception.
     *
-    * @return  the window state causing this exception
+    * @return the window state causing this exception
     */
    public WindowState getState()
    {

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal;
 
 import java.io.Serializable;
@@ -30,34 +31,22 @@
 public class Mode implements Serializable
 {
 
-   /**
-    * The serialVersionUID.
-    */
+   /** The serialVersionUID. */
    private static final long serialVersionUID = 6033765240710422050L;
 
-   /**
-    * .
-    */
+   /** . */
    public static final Mode EDIT = new Mode("edit");
 
-   /**
-    * .
-    */
+   /** . */
    public static final Mode HELP = new Mode("help");
 
-   /**
-    * .
-    */
+   /** . */
    public static final Mode VIEW = new Mode("view");
 
-   /**
-    * .
-    */
+   /** . */
    public static final Mode EDIT_DEFAULTS = new Mode("edit_defaults");
 
-   /**
-    * .
-    */
+   /** . */
    private String name;
 
    public Mode(String name)

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal;
 
 import java.io.Serializable;
@@ -30,9 +31,7 @@
 public class WindowState implements Serializable
 {
 
-   /**
-    * The serialVersionUID
-    */
+   /** The serialVersionUID */
    private static final long serialVersionUID = -6305311518934458562L;
    public static final WindowState NORMAL = new WindowState("normal");
    public static final WindowState MINIMIZED = new WindowState("minimized");

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

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/PortalNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/PortalNode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/PortalNode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.api.node;
 
 import java.util.Collection;
@@ -42,34 +43,22 @@
    /** A node of type window. */
    int TYPE_WINDOW = 3;
 
-   /**
-    * Return the node type.
-    */
+   /** Return the node type. */
    int getType();
 
-   /**
-    * Return the root node of this node.
-    */
+   /** Return the root node of this node. */
    PortalNode getRoot();
 
-   /**
-    * Return the parent node of this node.
-    */
+   /** Return the parent node of this node. */
    PortalNode getParent();
 
-   /**
-    * Return the node name relative to its parent.
-    */
+   /** Return the node name relative to its parent. */
    String getName();
 
-   /**
-    * Return a child of this object.
-    */
+   /** Return a child of this object. */
    PortalNode getChild(String name);
 
-   /**
-    * Return the children of this object.
-    */
+   /** Return the children of this object. */
    Collection getChildren();
 
    /**

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

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.node.event;
 
 import org.jboss.portal.api.node.PortalNode;
 
-/**
- * @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 PortalNodeEvent
 {
 

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

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.api.node.event;
 
 /**
@@ -31,7 +32,7 @@
     * Dispatch an event to the listener.
     *
     * @param context the bubbler to perform the event bubbling control
-    * @param event the fired event
+    * @param event   the fired event
     * @return the next event or null to keep the same event
     */
    PortalNodeEvent onEvent(PortalNodeEventContext context, PortalNodeEvent event);

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

Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.node.event;
 
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.api.node.PortalNode;
 
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- */
+/** @author <a href="mailto:julien at jboss.org">Julien Viet</a> */
 public class WindowEvent extends PortalNodeEvent
 {
 

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

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

Modified: branches/JBoss_Portal_Branch_2_4/bridge/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/bridge/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/bridge/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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$ -->
 
@@ -32,7 +55,7 @@
    <!--+====================================================================+-->
 
    &buildmagic;
-  
+
    &modules;
    &defaults;
    &tools;
@@ -60,7 +83,7 @@
    <target name="configure" unless="configure.disable">
 
       <!-- Configure thirdparty libraries -->
-       &libraries;
+      &libraries;
       <path id="library.classpath">
          <path refid="jbossas/core.libs.classpath"/>
          <path refid="apache.log4j.classpath"/>
@@ -106,8 +129,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. -->
@@ -122,12 +145,12 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/portal-bridge-lib.jar" > <!-- manifest="${build.etc}/portal-cms-lib-jar.mf" -->
+      <jar jarfile="${build.lib}/portal-bridge-lib.jar"> <!-- manifest="${build.etc}/portal-cms-lib-jar.mf" -->
          <fileset dir="${build.classes}"/>
       </jar>
 

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

Modified: branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,26 +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.bridge;
 
+import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+
+import javax.portlet.PortletRequest;
+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;
@@ -29,16 +39,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.portlet.PortletRequest;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.bridge;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Locale;
+import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 
+import javax.portlet.PortletResponse;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletResponse;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Locale;
 
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -146,14 +146,17 @@
             sos = new ServletOutputStream()
             {
                private OutputStream out = ((RenderResponse)presp).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: branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.bridge;
 
 import org.apache.portals.bridges.common.ServletContextProvider;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.portlet.GenericPortlet;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
- * The JBoss implementation of <code>org.apache.portals.bridges.common.ServletContextProvider</code> use thread local variables
- * to keep the request associated with the current thread of execution.
+ * The JBoss implementation of <code>org.apache.portals.bridges.common.ServletContextProvider</code> use thread local
+ * variables to keep the request associated with the current thread of execution.
  *
  * @author <a href="mailto:dr at vizuri.com">Swarn Dhaliwal</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -55,9 +56,7 @@
       return (BridgeInfo)local.get();
    }
 
-   /**
-    * @throws IllegalStateException if no bridge info is found
-    */
+   /** @throws IllegalStateException if no bridge info is found */
    public ServletContext getServletContext(GenericPortlet genericPortlet) throws IllegalStateException
    {
       BridgeInfo info = ((BridgeInfo)local.get());
@@ -68,9 +67,7 @@
       return info.ctx;
    }
 
-   /**
-    * @throws IllegalStateException if no bridge info is found
-    */
+   /** @throws IllegalStateException if no bridge info is found */
    public HttpServletRequest getHttpServletRequest(GenericPortlet genericPortlet, PortletRequest portletRequest) throws IllegalStateException
    {
       BridgeInfo info = (BridgeInfo)JBossServletContextProvider.local.get();
@@ -85,9 +82,7 @@
       return info.breq;
    }
 
-   /**
-    * @throws IllegalStateException if no bridge info is found
-    */
+   /** @throws IllegalStateException if no bridge info is found */
    public HttpServletResponse getHttpServletResponse(GenericPortlet genericPortlet, PortletResponse portletResponse) throws IllegalStateException
    {
       BridgeInfo info = (BridgeInfo)JBossServletContextProvider.local.get();
@@ -102,9 +97,7 @@
       return info.bresp;
    }
 
-   /**
-    * Lazy initialisation of the bridge info.
-    */
+   /** Lazy initialisation of the bridge info. */
    private void init(BridgeInfo bridgeInfo)
    {
       bridgeInfo.breq = new BridgeRequest(bridgeInfo);

Modified: branches/JBoss_Portal_Branch_2_4/build/ide/intellij/idea50/modules/thirdparty/thirdparty.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/build/ide/intellij/idea50/modules/thirdparty/thirdparty.iml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/build/ide/intellij/idea50/modules/thirdparty/thirdparty.iml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4" relativePaths="true" type="JAVA_MODULE">
   <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../../../../../thirdparty/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
@@ -9,5 +9,178 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntryProperties />
   </component>
+  <component name="copyright">
+    <Base>
+      <setting name="state" value="1" />
+    </Base>
+    <LanguageOptions name="$TEMPLATE$">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="true" />
+          <option name="separateAfter" value="true" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="true" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="JBoss, a division of Red Hat&#10;Copyright &amp;#36;today.year, Red Hat Middleware, LLC, and individual &#10;contributors as indicated by the @authors tag. See the &#10;copyright.txt in the distribution for a full listing of &#10;individual contributors.&#10;&#10;This is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU Lesser General Public License as&#10;published by the Free Software Foundation; either version 2.1 of&#10;the License, or (at your option) any later version.&#10;&#10;This software is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#10;Lesser General Public License for more details.&#10;&#10;You should have received a copy of the GNU Lesser General Public&#10;License along with this software; if not, write to the Free&#10;Software Foundation, Inc., 51 Fr!
 anklin St, Fifth Floor, Boston, MA&#10;02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="4" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="CSS">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="1" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="HTML">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="1" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JAVA">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JSP">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="1" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JavaScript">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="1" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="Properties">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="1" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="XML">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+  </component>
 </module>
 

Modified: branches/JBoss_Portal_Branch_2_4/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,output">
 	
-	<!-- 
-				generates artifacts used for tests, requires output to be previously run
-	-->
-	<target name="package-tests" depends="init,output">		 
-	
 		 <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,8 +242,8 @@
 	</target>
 	
 	<target name="deploy-tests"
-	           description="Deploy."
-	           depends="package-tests">		  
+           description="Deploy."
+           depends="package-tests">
 	
 	<!-- 
 			  		upgrage the jbosscache/groups of the HA instances for the puropse of testing
@@ -228,13 +251,14 @@
 			  		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="${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-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"/>
@@ -244,10 +268,10 @@
 	</target>
 	
 	<target name="undeploy-tests"
-		           description="UnDeploy." depends="init">
+           description="UnDeploy." depends="init">
 	
 		      <!-- 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 +352,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 +373,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 +387,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 +429,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMS.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMS.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMS.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/Command.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/Command.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/Command.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CommandFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/CommandFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -35,25 +50,9 @@
 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/>
@@ -99,9 +98,7 @@
    protected String deleteFolderStmt;
    protected String insertFileStmt;
 
-   /**
-    * Default constructor
-    */
+   /** Default constructor */
    public HibernateStore()
    {
       initialized = false;
@@ -129,7 +126,7 @@
 
    public void init() throws FileSystemException
    {
-      if(initialized)
+      if (initialized)
       {
          throw new IllegalStateException("already initialized");
       }
@@ -139,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");
       }
@@ -180,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);
       }
@@ -207,7 +205,7 @@
     */
    public void deleteFile(String filePath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -226,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;
@@ -297,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");
       }
@@ -319,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);
 
             }
@@ -368,7 +366,7 @@
          }
          tx.commit();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          tx.rollback();
          String msg = "failed to delete folder: " + folderPath;
@@ -386,7 +384,7 @@
     */
    public boolean exists(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -401,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);
@@ -429,7 +427,7 @@
     */
    public boolean isFile(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -444,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);
@@ -472,7 +470,7 @@
     */
    public boolean isFolder(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -487,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);
@@ -515,7 +513,7 @@
     */
    public long lastModified(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -530,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);
@@ -558,7 +556,7 @@
     */
    public long length(String filePath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -573,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);
@@ -601,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);
       }
@@ -618,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);
@@ -865,7 +863,7 @@
     */
    public InputStream getInputStream(String filePath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -881,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;
@@ -913,9 +911,9 @@
     *
     */
    public OutputStream getOutputStream(final String filePath)
-         throws FileSystemException
+      throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -925,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);
       }
@@ -951,7 +949,7 @@
                InputStream in = null;
                try
                {
-                  if(isFile(filePath))
+                  if (isFile(filePath))
                   {
                      // update
                      Session session = hibernateSessionFactory.openSession();
@@ -960,13 +958,13 @@
                      {
                         long length = f.length();
                         in = 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);
                            }
@@ -977,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);
                            }
@@ -994,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);
                            }
@@ -1014,7 +1012,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to update existing file: " + filePath;
@@ -1034,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);
@@ -1052,7 +1050,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to create new file: " + filePath;
@@ -1065,7 +1063,7 @@
                      }
                   }
                }
-               catch(Exception e)
+               catch (Exception e)
                {
                   throw new IOException(e.getMessage());
                }
@@ -1079,7 +1077,7 @@
             }
          };
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to open output strean to file: " + filePath;
          log.error(msg, e);
@@ -1098,9 +1096,9 @@
     *
     */
    public RandomAccessOutputStream getRandomAccessOutputStream(final String filePath)
-         throws FileSystemException, UnsupportedOperationException
+      throws FileSystemException, UnsupportedOperationException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -1110,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);
       }
@@ -1127,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);
@@ -1136,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);
                }
@@ -1160,7 +1158,7 @@
                InputStream in = null;
                try
                {
-                  if(isFile(filePath))
+                  if (isFile(filePath))
                   {
                      // update
                      Session session = hibernateSessionFactory.openSession();
@@ -1169,13 +1167,13 @@
                      {
                         long length = f.length();
                         in = 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);
                            }
@@ -1186,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);
                            }
@@ -1203,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);
                            }
@@ -1223,7 +1221,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to update existing file: " + filePath;
@@ -1243,17 +1241,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);
@@ -1261,7 +1259,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to create new file: " + filePath;
@@ -1274,7 +1272,7 @@
                      }
                   }
                }
-               catch(Exception e)
+               catch (Exception e)
                {
                   throw new IOException(e.getMessage());
                }
@@ -1314,7 +1312,7 @@
             }
          };
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to open output strean to file: " + filePath;
          log.error(msg, e);
@@ -1327,7 +1325,7 @@
     */
    public void copy(String srcPath, String destPath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -1335,7 +1333,7 @@
       FileSystemPathUtil.checkFormat(srcPath);
       FileSystemPathUtil.checkFormat(destPath);
 
-      if(isFolder(srcPath))
+      if (isFolder(srcPath))
       {
          // src is a folder
          copyDeepFolder(srcPath, destPath);
@@ -1352,7 +1350,7 @@
     */
    public void move(String srcPath, String destPath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -1362,7 +1360,7 @@
 
 // @todo optimize move (use sql update stmts)
       copy(srcPath, destPath);
-      if(isFile(srcPath))
+      if (isFile(srcPath))
       {
          deleteFile(srcPath);
       }
@@ -1375,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
     */
@@ -1440,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
     */
@@ -1452,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);
@@ -1478,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);
          }
@@ -1502,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);
@@ -1523,7 +1519,7 @@
          session.flush();
          tx.commit();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          tx.rollback();
          String msg = "failed to create folder entry: " + folderPath;
@@ -1544,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");
 /*
@@ -1588,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");
 /*
@@ -1723,8 +1718,6 @@
       }
 
 
-
-
    }
 
 }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.cms.impl.cache;
 
-import java.util.Locale;
-
 import org.jboss.cache.CacheException;
 import org.jboss.cache.TreeCacheMBean;
 import org.jboss.logging.Logger;
@@ -32,6 +31,8 @@
 import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -34,27 +30,28 @@
 import org.jboss.portal.cms.impl.jcr.command.DeleteCommand;
 import org.jboss.portal.cms.impl.jcr.command.FileGetCommand;
 import org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand;
-import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
 import org.jboss.portal.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
 {
-   
+
    private CMSTreeCacheService cache;
-   
+
    public Logger log = Logger.getLogger(CacheInterceptor.class);
-   
-   
+
+
    private void loadCache()
    {
       try
       {
          InitialContext ic = new InitialContext();
-         cache = (CMSTreeCacheService) ic.lookup(CMSTreeCacheService.JNDIName);
+         cache = (CMSTreeCacheService)ic.lookup(CMSTreeCacheService.JNDIName);
       }
       catch (NamingException e)
       {
@@ -69,7 +66,7 @@
       {
          loadCache();
       }
-      
+
       if (invocation instanceof DeleteCommand)
       {
          // delete from cache
@@ -118,7 +115,7 @@
          else
          {
             invocation.invokeNext();
-            File result = (File) invocation.getResult();
+            File result = (File)invocation.getResult();
             if (result != null)
             {
                log.trace(path + "/" + locale + " written to cache");

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -61,7 +49,18 @@
 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>
@@ -82,9 +81,9 @@
 
    private String homeDir;
    private String repositoryName;
-   
+
    private InterceptorStack cmsStack;
-   
+
    private Element config;
 
    public JCRCMS()
@@ -157,21 +156,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");
@@ -182,10 +179,7 @@
    }
 
 
-   /**
-    * Shuts down the repo and unregisters it
-    *
-    */
+   /** Shuts down the repo and unregisters it */
    public void stopService()
    {
       log.info("Stopping JCR CMS");
@@ -198,7 +192,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);
@@ -216,10 +210,10 @@
       Logger.getLogger("org.apache.jackrabbit").setLevel(Level.ERROR);
 
       //
-      if(doChecking)
+      if (doChecking)
       {
          // Check default content exists.
-         if(!contentExists())
+         if (!contentExists())
          {
             createContent();
          }
@@ -252,11 +246,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.");
@@ -269,6 +260,7 @@
       {
          // Handle the name atoms
          LinkedList atoms = new LinkedList();
+
          public void startDir(URL url, String name)
          {
             // Compute the uri for the folder
@@ -305,10 +297,12 @@
 
             atoms.addLast(name);
          }
+
          public void endDir(URL url, String name)
          {
             atoms.removeLast();
          }
+
          public void file(URL url, String name)
          {
             InputStream in = null;
@@ -318,7 +312,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);
@@ -326,7 +320,6 @@
                tmp.append("/").append(name);
                String uri = tmp.toString();
 
-
                // Load the content of the file
                ByteArrayOutputStream baos = new ByteArrayOutputStream();
                InputStream urlin = null;
@@ -352,7 +345,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));
                }
@@ -364,7 +357,7 @@
 
                Command newFileCMD = getCommandFactory().createNewFileCommand(file, content);
                execute(newFileCMD);
-               
+
             }
             catch (Exception e)
             {
@@ -395,101 +388,100 @@
    }
 
    public Object execute(Command cmd) throws CMSException
-   {      
-       org.apache.jackrabbit.core.XASession session = null;
-       try
-       {
-          session = (org.apache.jackrabbit.core.XASession) jcr.login("anonid", "");
-       }
-       catch (Exception e)
-       {
-          throw new RuntimeException(e); // Fixme
-       }
-       // get XAResource
-       XAResource xares = session.getXAResource();
+   {
+      org.apache.jackrabbit.core.XASession session = null;
+      try
+      {
+         session = (org.apache.jackrabbit.core.XASession)jcr.login("anonid", "");
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e); // Fixme
+      }
+      // get XAResource
+      XAResource xares = session.getXAResource();
 
-       // create dummy Xid
-       Xid xid = new Xid()
-       {
-          public byte[] getBranchQualifier()
-          {
-             return new byte[0];
-          }
+      // create dummy Xid
+      Xid xid = new Xid()
+      {
+         public byte[] getBranchQualifier()
+         {
+            return new byte[0];
+         }
 
-          public int getFormatId()
-          {
-             return 0;
-          }
+         public int getFormatId()
+         {
+            return 0;
+         }
 
-          public byte[] getGlobalTransactionId()
-          {
-             return new byte[0];
-          }
-       };
+         public byte[] getGlobalTransactionId()
+         {
+            return new byte[0];
+         }
+      };
 
-       Object obj = new Object();
-       try
-       {
-          xares.start(xid,XAResource.TMNOFLAGS);
+      Object obj = new Object();
+      try
+      {
+         xares.start(xid, XAResource.TMNOFLAGS);
 
-          // .... add new nodes & properties and save them
-          JCRCommand jcrCmd = (JCRCommand) cmd;
-          JCRCommandContext ctx = new JCRCommandContext(session, commandFactory, defaultLocale);
-          jcrCmd.setContext(ctx);
-          
-          
-          if ((cmsStack != null) && (cmsStack.getInterceptors().length != 0))
-          {
-             jcrCmd.invoke(cmsStack.getInterceptors());
-          }
-          else
-          {
-             jcrCmd.dispatch();
-          }
-          obj = jcrCmd.getResult();
-                   
-                            
-          //committ the transaction
-          xares.end(xid, XAResource.TMSUCCESS);
-          xares.prepare(xid);
-          session.save();
-          xares.commit(xid,false);
-       }
-       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);
-           }
-           
-          if (e instanceof CMSException)
-          {
-             throw (CMSException)e;
-          }
-          else if (e instanceof RuntimeException)
-          {
-             throw (RuntimeException)e;
-          }
-          else
-          {
-             throw new CMSException(e);
-          }         
-       }
-       finally
-       {
-          if (session != null)
-          {                          
-              //must do this otherwise, the whole cms will hang
-              session.logout();                          
-          }
-       }
-       return obj;
+         // .... add new nodes & properties and save them
+         JCRCommand jcrCmd = (JCRCommand)cmd;
+         JCRCommandContext ctx = new JCRCommandContext(session, commandFactory, defaultLocale);
+         jcrCmd.setContext(ctx);
+
+
+         if ((cmsStack != null) && (cmsStack.getInterceptors().length != 0))
+         {
+            jcrCmd.invoke(cmsStack.getInterceptors());
+         }
+         else
+         {
+            jcrCmd.dispatch();
+         }
+         obj = jcrCmd.getResult();
+
+         //committ the transaction
+         xares.end(xid, XAResource.TMSUCCESS);
+         xares.prepare(xid);
+         session.save();
+         xares.commit(xid, false);
+      }
+      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);
+         }
+
+         if (e instanceof CMSException)
+         {
+            throw(CMSException)e;
+         }
+         else if (e instanceof RuntimeException)
+         {
+            throw(RuntimeException)e;
+         }
+         else
+         {
+            throw new CMSException(e);
+         }
+      }
+      finally
+      {
+         if (session != null)
+         {
+            //must do this otherwise, the whole cms will hang
+            session.logout();
+         }
+      }
+      return obj;
    }
 
    public void setCmsStack(InterceptorStack cmsStack)

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,63 +1,64 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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 java.io.Serializable;
 
+
 /**
  * Interface for executing operations.
  *
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  */
-public abstract class JCRCommand extends Command implements Serializable 
+public abstract class JCRCommand extends Command implements Serializable
 {
    public static String JCR_SESSION_ATTRIBUTE = "org.jboss.portal.cms.jcr.session";
    public static String JCR_COMMANDFATORY_ATTRIBUTE = "org.jboss.portal.cms.jcr.commandfactory";
    public static String JCR_LOCALE_ATTRIBUTE = "org.jboss.portal.cms.jcr.locale";
-   
+
    protected JCRCommandContext context;
-   
+
    private Object result;
-   
+
    public JCRCommandContext getContext()
    {
       return context;
    }
-   
+
    public void setContext(JCRCommandContext context)
    {
       this.context = context;
    }
-   
+
    public abstract Object execute() throws CMSException;
-   
+
    protected void dispatch() throws Exception, InvocationException
-   {  
+   {
       Object object = execute();
       setResult(object);
    }
@@ -66,7 +67,7 @@
    {
       return result;
    }
-      
+
    public void setResult(Object result)
    {
       this.result = result;

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.cms.impl.jcr;
 
 import org.jboss.portal.cms.CMSException;
 
+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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -32,6 +29,9 @@
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 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>
@@ -51,7 +51,7 @@
    {
       try
       {
-         Node fileNode = (Node) getContext().getSession().getItem(mFile.getBasePath());
+         Node fileNode = (Node)getContext().getSession().getItem(mFile.getBasePath());
 
          Node contentNode = fileNode.addNode(mFile.getContent().getLocale().getLanguage(), "portalcms:content");
          contentNode.setProperty("jcr:encoding", "UTF-8");
@@ -69,7 +69,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));
             }
@@ -79,11 +79,11 @@
             }
          }
          contentNode.addMixin("mix:versionable");
-         
+
          // Save this for other sessions.
          getContext().getSession().save();
-         }
-      catch(Exception e)
+      }
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,27 +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 java.util.Locale;
+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.model.Content;
+import org.jboss.portal.cms.util.FileUtil;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
@@ -30,16 +35,9 @@
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import java.util.Locale;
 
-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.model.Content;
-import org.jboss.portal.cms.util.FileUtil;
-
-/**
- * @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 */
@@ -79,7 +77,7 @@
    {
       try
       {
-         if(mlocale == null)
+         if (mlocale == null)
          {
             mlocale = context.getDefaultLocale();
          }
@@ -91,7 +89,7 @@
          Node contentNode = null;
          try
          {
-            contentNode = (Node) session.getItem(this.msPath + "/" + this.mlocale.getLanguage());
+            contentNode = (Node)session.getItem(this.msPath + "/" + this.mlocale.getLanguage());
          }
          catch (PathNotFoundException e)
          {
@@ -103,9 +101,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();
@@ -122,10 +120,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();
@@ -133,7 +131,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);
                   }
@@ -151,7 +149,7 @@
 
          return content;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          log.error("Cannot get content", e);
       }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/CMSObject.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/CMSObject.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/CMSObject.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Content.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Content.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Content.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/File.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/File.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/File.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Folder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Folder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/model/Folder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/FileUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/FileUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/FileUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.cms;
 
-import java.util.Map;
-
 import junit.framework.TestCase;
-
 import org.jboss.portal.test.framework.TestRuntimeContext;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 
+import java.util.Map;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -43,17 +43,17 @@
    private TestRuntimeContext runtimeContext;
 
    /**
-    * 
     *
+    *
     */
    public AbstractCMSTestCase(DataSourceSupport.Config dsCfg)
    {
       this.dsCfg = dsCfg;
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public AbstractCMSTestCase(Map parametrization)
    {

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,47 +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;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-
-import org.jboss.portal.common.util.LoaderResource;
-import org.jboss.portal.common.util.CLLoader;
+import junit.framework.TestSuite;
+import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.name.QName;
 import org.jboss.portal.cms.impl.jcr.jackrabbit.JackrabbitJCRService;
 import org.jboss.portal.cms.util.RepositoryUtil;
+import org.jboss.portal.common.util.CLLoader;
+import org.jboss.portal.common.util.LoaderResource;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
-import org.apache.jackrabbit.name.QName;
 
+import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 import javax.jcr.Workspace;
-import javax.jcr.Node;
 import javax.jcr.nodetype.NodeTypeManager;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
 
-import junit.framework.TestSuite;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -59,7 +58,7 @@
    public void setUp() throws Exception
    {
       super.setUp();
-      
+
       // Load config
       LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
       String config = res.asString();
@@ -90,7 +89,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")));
@@ -136,7 +135,7 @@
          RepositoryUtil.safeLogout(session);
       }
    }
-   
+
    public static TestSuite suite() throws Exception
    {
 
@@ -146,7 +145,7 @@
       for (int i = 0; i < configs.length; i++)
       {
          DataSourceSupport.Config config = configs[i];
-         
+
          //
          Method[] methods = JackrabbitTestCase.class.getMethods();
          for (int j = 0; j < methods.length; j++)
@@ -161,7 +160,7 @@
             }
          }
       }
-      
+
       //
       return suite;
    }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,35 +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.cms;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Session;
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.impl.jcr.JCRCMS;
 import org.jboss.portal.cms.util.RepositoryUtil;
 import org.jboss.portal.common.util.CLLoader;
@@ -37,6 +30,12 @@
 import org.jboss.portal.common.util.XML;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 
+import javax.jcr.Session;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.Locale;
+
 /**
  * Tests JCRCMS Service
  *
@@ -54,7 +53,7 @@
 
    public void setUp() throws Exception
    {
-	  super.setUp();
+      super.setUp();
       LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
 
       service = new JCRCMS();
@@ -92,7 +91,7 @@
       for (int i = 0; i < configs.length; i++)
       {
          DataSourceSupport.Config config = configs[i];
-         
+
          //
          Method[] methods = TestRepositoryBootStrap.class.getMethods();
          for (int j = 0; j < methods.length; j++)
@@ -107,7 +106,7 @@
             }
          }
       }
-      
+
       //
       return suite;
    }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.cms;
 
+import junit.framework.TestSuite;
+import org.jboss.portal.cms.util.NodeUtil;
+import org.jboss.portal.test.framework.embedded.DataSourceSupport;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.URL;
 
-import junit.framework.TestSuite;
-
-import org.jboss.portal.cms.util.NodeUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-
 /**
  * Tests RepositoryUtil
  *
@@ -94,7 +94,7 @@
          assertTrue("Wrong parent for /alpha/omega", parentPath.equals("/alpha"));
 
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
          fail("" + e);
@@ -114,7 +114,7 @@
          assertTrue("Wrong node name for /alpha/omega", nodeName.equals("omega"));
 
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
          fail("" + e);
@@ -146,7 +146,7 @@
       for (int i = 0; i < configs.length; i++)
       {
          DataSourceSupport.Config config = configs[i];
-         
+
          //
          Method[] methods = TestRepositoryUtil.class.getMethods();
          for (int j = 0; j < methods.length; j++)
@@ -161,7 +161,7 @@
             }
          }
       }
-      
+
       //
       return suite;
    }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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;
@@ -39,48 +40,48 @@
  */
 public class AbstractCommandTestCase extends AbstractCMSTestCase
 {
-    /**
-     * 
-     */
-    protected JCRCMS service;
+   /**
+    *
+    */
+   protected JCRCMS service;
 
    public AbstractCommandTestCase(Map parametrization)
    {
       super(parametrization);
    }
-   
+
    public AbstractCommandTestCase(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
 
    /**
-     * 
-     */
-    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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,43 +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.test.cms.commands;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-import java.util.Locale;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.model.Folder;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -45,32 +44,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -78,7 +77,7 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileArchiveUpload.class);
-      return suite;       
+      return suite;
    }
 
    public void testArchiveUpload() throws CMSException, IOException
@@ -86,15 +85,15 @@
       service.setDefaultLocale(Locale.ENGLISH.getLanguage());
       InputStream is = 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);
@@ -102,7 +101,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);
@@ -110,10 +109,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,32 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
@@ -36,7 +32,10 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -44,32 +43,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -77,12 +76,12 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileCopy.class);
-      return suite;       
+      return suite;
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileCopy() throws CMSException
    {
@@ -92,7 +91,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");
@@ -101,18 +100,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,35 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Node;
-import javax.jcr.Session;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
@@ -40,7 +33,12 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Node;
+import javax.jcr.Session;
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -48,32 +46,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -81,12 +79,12 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileCreate.class);
-      return suite;       
+      return suite;
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileCreate() throws Exception
    {
@@ -136,26 +134,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,36 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Item;
-import javax.jcr.Node;
-import javax.jcr.Session;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
@@ -43,7 +35,13 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Item;
+import javax.jcr.Node;
+import javax.jcr.Session;
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -51,32 +49,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -84,12 +82,12 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileCreateFailed.class);
-      return suite;       
+      return suite;
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileCreateFailed() throws Exception
    {

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,34 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Session;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
@@ -39,7 +33,11 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Session;
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -47,32 +45,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -80,17 +78,17 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileDelete.class);
-      return suite;       
+      return suite;
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileDelete() throws Exception
    {
       createFile();
-      
+
       // delete old test nodes
       Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFilePath);
       service.execute(deleteCMD);
@@ -113,11 +111,11 @@
       assertFalse(sText + " not Deleted", session.itemExists(sText));
 
       RepositoryUtil.safeLogout(session);
-   }   
-   
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,31 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
@@ -35,7 +32,10 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -43,32 +43,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -76,17 +76,15 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileGet.class);
-      return suite;       
+      return suite;
    }
 
-   /**
-    * 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");
@@ -94,11 +92,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,33 +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.cms.commands;
 
-import java.net.URL;
-import java.util.List;
-import java.util.Locale;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
@@ -37,7 +32,11 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.net.URL;
+import java.util.List;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -45,32 +44,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -78,31 +77,29 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileGetList.class);
-      return suite;       
+      return suite;
    }
 
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,32 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
@@ -36,7 +32,10 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -44,32 +43,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -77,24 +76,22 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileGetVersion.class);
-      return suite;       
+      return suite;
    }
 
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,35 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.Session;
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
@@ -41,7 +34,13 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.Session;
+import java.net.URL;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -49,32 +48,32 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -82,19 +81,20 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFileUpdate.class);
-      return suite;       
+      return suite;
    }
 
    /**
     * 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);
@@ -105,17 +105,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,33 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Date;
-import java.util.Locale;
-
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
@@ -38,7 +33,11 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.net.URL;
+import java.util.Date;
+import java.util.Locale;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -46,28 +45,24 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -75,69 +70,67 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFolderCopy.class);
-      return suite;       
+      return suite;
    }
 
-   
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,36 +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.cms.commands;
 
-import java.net.URL;
-import java.util.Date;
-
-
-import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.Session;
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.FolderImpl;
 import org.jboss.portal.cms.model.Folder;
@@ -38,7 +30,13 @@
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.Session;
+import java.net.URL;
+import java.util.Date;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -46,28 +44,24 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -75,13 +69,13 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFolderCreate.class);
-      return suite;       
+      return suite;
    }
 
-   
+
    /**
-    * 
     *
+    *
     */
    public void testFolderCreate() throws Exception
    {
@@ -100,7 +94,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"));
@@ -109,5 +103,5 @@
       Property description = folderNode.getProperty("portalcms:description");
       assertNotNull("Folder description  is null", description);
       assertTrue("Incorrect description for " + sFolderPath, description.getString().equals("Folder description"));
-   }   
+   }
 }

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.cms.commands;
 
-import java.net.URL;
-
-import javax.jcr.Session;
-
 import junit.framework.TestSuite;
-
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.util.RepositoryUtil;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Session;
+import java.net.URL;
 
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -40,28 +39,24 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -69,22 +64,23 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFolderDelete.class);
-      return suite;       
+      return suite;
    }
 
    /**
     * 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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.cms.commands;
 
-import java.net.URL;
-import java.util.Date;
-
 import junit.framework.TestSuite;
-
-import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.FolderImpl;
 import org.jboss.portal.cms.model.Folder;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import java.net.URL;
+import java.util.Date;
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -40,28 +40,24 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -69,26 +65,26 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFolderGet.class);
-      return suite;       
+      return suite;
    }
 
-   
+
    /**
-    * 
     *
+    *
     */
    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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.cms.commands;
 
-import java.net.URL;
-import java.util.Date;
-
-
-import javax.jcr.Property;
-import javax.jcr.Session;
-
 import junit.framework.TestSuite;
-
-import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.FolderImpl;
 import org.jboss.portal.cms.model.Folder;
 import org.jboss.portal.cms.util.RepositoryUtil;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
 
+import javax.jcr.Property;
+import javax.jcr.Session;
+import java.net.URL;
+import java.util.Date;
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -45,28 +43,24 @@
  */
 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(DataSourceSupport.Config dsCfg)
    {
       super(dsCfg);
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -74,20 +68,20 @@
       DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
       DatabaseTestSuite suite = new DatabaseTestSuite(configs);
       suite.addTestCase(TestFolderUpdate.class);
-      return suite;       
+      return suite;
    }
 
-   
+
    /**
-    * 
     *
+    *
     */
    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");
@@ -95,17 +89,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: branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/hibernate/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/hibernate/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/hibernate/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.UserTestCase">
-      <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.UserTestCase">
+         <constructor factoryMethod="getBean">
+            <factory bean="BeanFactory"/>
+            <parameter>TestBean</parameter>
+         </constructor>
+         <property name="hibernate"><inject bean="HibernateSupport"/></property>
+      </bean>
+   -->
 </deployment>

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,15 +150,15 @@
                   <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>
          </Repository>
       </attribute>
    </mbean>
-   
-   
+
+
    <!--
       | Uncomment in clustered mode : HASingleton registration      
    -->
@@ -175,153 +198,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>
@@ -335,18 +357,18 @@
                    </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>      
 </server>

Modified: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/fs-repository.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/fs-repository.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/fs-repository.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/repository.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/repository.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/jcr/repository.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/log4j.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/log4j.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/log4j.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/pm-cache.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/pm-cache.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/test/pm-cache.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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">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
+      -->
+      <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"
                        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 PortalCMSCacheLoader
-           -->           
-           <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 PortalCMSCacheLoader
+      -->
+      <attribute name="CacheLoaderConfiguration">
                <config>                
                    <passivation>false</passivation>
                    <preload></preload>

Modified: branches/JBoss_Portal_Branch_2_4/common/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -97,8 +120,8 @@
       <property name="javadoc.protected" value="false"/>
 
    </target>
-   
 
+
    <!--+====================================================================+-->
    <!--| Compile                                                            |-->
    <!--|                                                                    |-->
@@ -127,28 +150,28 @@
    <!--| 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-common-lib.jar" manifest="${build.etc}/portal-common-lib-jar.mf">
 	         <fileset dir="${build.classes}"/>
 	         <fileset dir="${build.resources}/format/code"/>
-	      </jar>     
+	      </jar>
 
-	      <!-- Build the ant task that explodes archives -->
-	      <jar jarfile="${build.lib}/explode.jar">
+      <!-- Build the ant task that explodes archives -->
+      <jar jarfile="${build.lib}/explode.jar">
 	       <fileset dir="${build.classes}">
 		      <include name="org/jboss/portal/common/ant/*"/>
 		   </fileset>
 	    </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.jar">
 	            <fileset dir="${build.resources}/test/test-jar"/>
 	       </jar>
@@ -202,7 +225,8 @@
             <test todir="${test.reports}" name="org.jboss.portal.test.common.ParameterMapTestCase"/>
             <test todir="${test.reports}" name="org.jboss.portal.test.common.LocalizedStringTestCase"/>
             <test todir="${test.reports}" name="org.jboss.portal.test.common.ImplodeTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.common.Application_XWWWFormURLEncodedFormatTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.common.Application_XWWWFormURLEncodedFormatTestCase"/>
          </x-test>
          <x-classpath>
             <pathelement location="${build.classes}"/>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/FQN.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/FQN.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/FQN.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common;
 
 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: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/MediaType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/MediaType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/MediaType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common;
 
 import javax.activation.MimeType;
@@ -32,114 +33,80 @@
 import java.util.Set;
 
 /**
- * This is a immutable wrapper to the activation MimeTpye.
- * <p>This class contains some extensions to the activation MimeType, such as the typesafe enum
- * pattern, and allows for a mime type to specify allowed sub types.</p>
+ * This is a immutable wrapper to the activation MimeTpye. <p>This class contains some extensions to the activation
+ * MimeType, such as the typesafe enum pattern, and allows for a mime type to specify allowed sub types.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
- * @version $LastChangedRevision: 695 $, $LastChangedDate: 2004-12-15 14:41:10 -0500 (Wed, 15 Dec 2004) $
- * @see javax.activation.MimeType
- *      see also ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/
+ * @version $LastChangedRevision$, $LastChangedDate$
+ * @see javax.activation.MimeType see also ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/
  */
 public final class MediaType
 {
    private static Map allowedTypes = new HashMap();
    private static Map supportedExtensions = new HashMap();
 
-   /**
-    * Mime type 'Any' maps to an accept mime type of '*.*' (used by IE for css, images, etc.)
-    */
+   /** Mime type 'Any' maps to an accept mime type of '*.*' (used by IE for css, images, etc.) */
    public static final MediaType ANY =
       new MediaType("*", "*", new String[]{});
 
-   /**
-    * Mime type xhtml
-    */
+   /** Mime type xhtml */
    public static final MediaType XHTML = new MediaType("application", "xhtml+xml",
       new String[]{"xhtml"});
 
-   /**
-    * Mime type html
-    */
+   /** Mime type html */
    public static final MediaType HTML = new MediaType("text", "html",
       new String[]{"html", "htm"},
       new MediaType[]{XHTML});
 
-   /**
-    * Mime type form (application/x-www-form-urlencoded)
-    */
+   /** Mime type form (application/x-www-form-urlencoded) */
    public static final MediaType FORM =
       new MediaType("application", "x-www-form-urlencoded", new String[]{});
 
-   /**
-    * Mime type xml
-    */
+   /** Mime type xml */
    public static final MediaType XML = new MediaType("text", "xml", new String[]{"xml"},
       new MediaType[]{XHTML});
 
-   /**
-    * Mime type wml
-    */
+   /** Mime type wml */
    public static final MediaType WML = new MediaType("text", "vnd.wap.wml",
       new String[]{"wml"});
 
-   /**
-    * Mime type css
-    */
+   /** Mime type css */
    public static final MediaType CSS = new MediaType("text", "css",
       new String[]{"css"});
 
-   /**
-    * Mime type text
-    */
+   /** Mime type text */
    public static final MediaType TEXT = new MediaType("text", "plain",
       new String[]{"txt"});
 
-   /**
-    * Mime type js
-    */
+   /** Mime type js */
    public static final MediaType JS = new MediaType("text", "javascript",
       new String[]{"js"});
 
-   /**
-    * Mime type svg
-    */
+   /** Mime type svg */
    public static final MediaType SVG = new MediaType("image", "svg+xml",
       new String[]{"svg"});
 
-   /**
-    * Mime type jpeg
-    */
+   /** Mime type jpeg */
    public static final MediaType JPEG = new MediaType("image", "jpeg",
       new String[]{"jpeg", "jpg"});
 
-   /**
-    * Mime type gif
-    */
+   /** Mime type gif */
    public static final MediaType GIF = new MediaType("image", "gif",
       new String[]{"gif"});
 
-   /**
-    * Mime type png
-    */
+   /** Mime type png */
    public static final MediaType PNG = new MediaType("image", "png",
       new String[]{"png"});
 
-   /**
-    * Mime type wbmp
-    */
+   /** Mime type wbmp */
    public static final MediaType WBMP = new MediaType("image", "vnd.wap.wbmp",
       new String[]{"wbpm"});
 
-   /**
-    * Mime type rss
-    */
+   /** Mime type rss */
    public static final MediaType RSS = new MediaType("application", "rss+xml",
       new String[]{});
 
-   /**
-    * Mime type ico (see http://filext.com/detaillist.php?extdetail=ICO)
-    */
+   /** Mime type ico (see http://filext.com/detaillist.php?extdetail=ICO) */
    public static final MediaType ICO = new MediaType("application", "octet-stream",
       new String[]{"ico"});
    private MimeType m_mimeType = null;
@@ -215,8 +182,8 @@
    }
 
    /**
-    * Get the mime type for the presented string.
-    * <p>The string is handles as a file name extension. example: 'xml' returns MediaType.XML</p>
+    * Get the mime type for the presented string. <p>The string is handles as a file name extension. example: 'xml'
+    * returns MediaType.XML</p>
     *
     * @param extension the <code>java.lang.String</code> to parse into a <code>RegistryMimeTpye</code>
     * @return the <code>RegistryMimeTpye</code> that matches with the presented string

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/AbstractDeploymentTask.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/AbstractDeploymentTask.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/AbstractDeploymentTask.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,41 +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.common.ant;
 
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
-import org.codehaus.cargo.generic.configuration.ConfigurationFactory;
-import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory;
-import org.codehaus.cargo.generic.ContainerFactory;
-import org.codehaus.cargo.generic.DefaultContainerFactory;
+import org.apache.tools.ant.Task;
+import org.codehaus.cargo.container.ContainerType;
+import org.codehaus.cargo.container.RemoteContainer;
 import org.codehaus.cargo.container.configuration.Configuration;
 import org.codehaus.cargo.container.configuration.ConfigurationType;
+import org.codehaus.cargo.container.jboss.JBossJMXDeployer;
 import org.codehaus.cargo.container.property.GeneralPropertySet;
 import org.codehaus.cargo.container.property.ServletPropertySet;
-import org.codehaus.cargo.container.RemoteContainer;
-import org.codehaus.cargo.container.ContainerType;
-import org.codehaus.cargo.container.jboss.JBossJMXDeployer;
-import org.codehaus.cargo.container.deployable.Deployable;
-import org.codehaus.cargo.container.deployable.EAR;
+import org.codehaus.cargo.generic.ContainerFactory;
+import org.codehaus.cargo.generic.DefaultContainerFactory;
+import org.codehaus.cargo.generic.configuration.ConfigurationFactory;
+import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory;
 
 import java.io.File;
 

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Explode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Explode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Explode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,30 +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.common.ant;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -41,29 +47,19 @@
 public class Explode extends Task
 {
 
-   /**
-    * Unzipped extensions.
-    */
+   /** Unzipped extensions. */
    private static final Set extensions = new HashSet(Arrays.asList(new String[]{"ear", "war", "sar", "har"}));
 
-   /**
-    * The exploded file.
-    */
+   /** The exploded file. */
    private File file;
 
-   /**
-    * The target directory.
-    */
+   /** The target directory. */
    private File todir;
 
-   /**
-    * The target optional name.
-    */
+   /** The target optional name. */
    private String name;
 
-   /**
-    * filename to exclude from decompression *
-    */
+   /** filename to exclude from decompression * */
    private String exclude;
 
    public void setExclude(String exclude)
@@ -92,7 +88,7 @@
       {
          explode(file, todir);
       }
-      catch(DirException e)
+      catch (DirException e)
       {
          throw new BuildException(e.getMessage());
       }
@@ -100,15 +96,15 @@
 
    public void explode(File file, File todir) throws BuildException, DirException
    {
-      if(!file.exists())
+      if (!file.exists())
       {
          throw new BuildException("source file does not exists");
       }
-      if(!file.isFile())
+      if (!file.isFile())
       {
          throw new BuildException("source file is not file");
       }
-      if(name == null)
+      if (name == null)
       {
          name = file.getName();
       }
@@ -120,19 +116,19 @@
          log("Process archive " + name);
          explode(this, name, zip, todir, this.exclude);
       }
-      catch(FileNotFoundException e)
+      catch (FileNotFoundException e)
       {
          throw new BuildException("Unexpected error " + e.getMessage());
       }
       finally
       {
-         if(in != null)
+         if (in != null)
          {
             try
             {
                in.close();
             }
-            catch(IOException ignored)
+            catch (IOException ignored)
             {
             }
          }
@@ -152,11 +148,11 @@
    public static void explode(Explode explode, String name, ZipInputStream zip, File todir, String exclude) throws BuildException, DirException
    {
       // First ensure the target directory exists
-      if(!todir.exists())
+      if (!todir.exists())
       {
          throw new BuildException("target dir does not exists");
       }
-      if(!todir.isDirectory())
+      if (!todir.isDirectory())
       {
          throw new BuildException("target dir is not a directory");
       }
@@ -172,25 +168,25 @@
          ensureDirExist(explode, todir);
 
          // Process each file
-         for(ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip.getNextEntry())
+         for (ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip.getNextEntry())
          {
             // Next entry
             File fic = new File(todir, entry.getName());
             int lastDot = fic.getName().lastIndexOf(".");
 
-            if(entry.isDirectory())
+            if (entry.isDirectory())
             {
                // This is a directory that we must create
                try
                {
                   ensureDirExist(explode, fic);
                }
-               catch(DirException e)
+               catch (DirException e)
                {
                   explode.log(e.getMessage());
                }
             }
-            else if(lastDot != -1 && extensions.contains(fic.getName().substring(lastDot + 1)))
+            else if (lastDot != -1 && extensions.contains(fic.getName().substring(lastDot + 1)))
             {
                // This is a nested archive, we explode it
                try
@@ -201,7 +197,7 @@
                      explode(explode, fic.getName(), new ZipInputStream(zip), todir, exclude);
                   }
                }
-               catch(DirException e)
+               catch (DirException e)
                {
                   explode.log(e.getMessage());
                }
@@ -213,24 +209,24 @@
                try
                {
                   out = new FileOutputStream(fic);
-                  for(int size = zip.read(buffer); size != -1; size = zip.read(buffer))
+                  for (int size = zip.read(buffer); size != -1; size = zip.read(buffer))
                   {
                      out.write(buffer, 0, size);
                   }
                }
-               catch(IOException e)
+               catch (IOException e)
                {
                   explode.log("Problem when writing file " + e.getMessage());
                }
                finally
                {
-                  if(out != null)
+                  if (out != null)
                   {
                      try
                      {
                         out.close();
                      }
-                     catch(IOException ignored)
+                     catch (IOException ignored)
                      {
                      }
                   }
@@ -238,24 +234,22 @@
             }
          }
       }
-      catch(ZipException e)
+      catch (ZipException e)
       {
          throw new BuildException(e);
       }
-      catch(IOException e)
+      catch (IOException e)
       {
          throw new BuildException(e);
       }
    }
 
-   /**
-    * When it returns the dir exists otherwise it throws a BuildException
-    */
+   /** When it returns the dir exists otherwise it throws a BuildException */
    private static void ensureDirExist(Explode explode, File dir) throws FileIsNotDirException, CannotCreateDirException
    {
-      if(dir.exists())
+      if (dir.exists())
       {
-         if(dir.isDirectory())
+         if (dir.isDirectory())
          {
             // explode.log(dir.getName() + " exists and is used");
          }
@@ -266,7 +260,7 @@
       }
       else
       {
-         if(dir.mkdirs())
+         if (dir.mkdirs())
          {
             // explode.log("Created directory " + dir.getName());
          }

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Implode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Implode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Implode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.ant;
 
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -42,19 +43,13 @@
 public class Implode extends Task
 {
 
-   /**
-    * Unzipped extensions.
-    */
+   /** Unzipped extensions. */
    private static final Set extensions = new HashSet(Arrays.asList(new String[]{"ear", "war", "sar", "har"}));
 
-   /**
-    * The exploded dir.
-    */
+   /** The exploded dir. */
    private File dir;
 
-   /**
-    * The target file.
-    */
+   /** The target file. */
    private File tofile;
 
    public void setDir(File dir)
@@ -145,7 +140,7 @@
             out.putNextEntry(fileEntry);
 
             //
-            for (int l = in.read(bytes, 0, bytes.length); l > - 0; l = in.read(bytes, 0, bytes.length))
+            for (int l = in.read(bytes, 0, bytes.length); l > -0; l = in.read(bytes, 0, bytes.length))
             {
                out.write(bytes, 0, l);
             }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Undeploy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Undeploy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/ant/Undeploy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.ant;
 
-import org.codehaus.cargo.container.jboss.JBossJMXDeployer;
 import org.codehaus.cargo.container.deployable.Deployable;
 import org.codehaus.cargo.container.deployable.EAR;
+import org.codehaus.cargo.container.jboss.JBossJMXDeployer;
 
 /**
  * A blocking undeploy task.

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/CompositeCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/CompositeCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/CompositeCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.command;
 
+import org.jboss.portal.common.command.result.Result;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import org.jboss.portal.common.command.result.Result;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

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

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CommandFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CommandFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CommandFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.command.filter;
 
-import org.jboss.portal.common.command.result.Result;
 import org.jboss.portal.common.command.Command;
 import org.jboss.portal.common.command.CommandException;
+import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CompositeFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CompositeFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/CompositeFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.command.filter;
 
 import org.jboss.portal.common.command.Command;
+import org.jboss.portal.common.command.CommandException;
 import org.jboss.portal.common.command.CompositeCommand;
-import org.jboss.portal.common.command.CommandException;
 import org.jboss.portal.common.command.result.CompositeResult;
 import org.jboss.portal.common.command.result.Result;
 

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/ExecuteFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/ExecuteFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/filter/ExecuteFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.command.filter;
 
+import org.jboss.portal.common.command.Command;
+import org.jboss.portal.common.command.CommandException;
 import org.jboss.portal.common.command.result.Result;
-import org.jboss.portal.common.command.CommandException;
-import org.jboss.portal.common.command.Command;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/CompositeResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/CompositeResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/CompositeResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.command.result;
 
+import org.jboss.portal.common.command.CommandConstants;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/ImmutableResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/ImmutableResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/ImmutableResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/Result.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/Result.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/command/result/Result.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.command.result;
 
 /**

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/concurrent/Valve.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/concurrent/Valve.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/concurrent/Valve.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.concurrent;
 
 /**
@@ -33,50 +34,34 @@
 
    // Constants -----------------------------------------------------
 
-   /**
-    * The valve is open.
-    */
+   /** The valve is open. */
    public static final int OPEN = 0;
 
-   /**
-    * The valve is in holding state.
-    */
+   /** The valve is in holding state. */
    public static final int CLOSING = 1;
 
-   /**
-    * The valve is in hold state.
-    */
+   /** The valve is in hold state. */
    public static final int CLOSED = 2;
 
-   /**
-    * User friendly names.
-    */
-   private static final String[] STATE_NAMES = {"OPEN","CLOSING","CLOSED"};
+   /** User friendly names. */
+   private static final String[] STATE_NAMES = {"OPEN", "CLOSING", "CLOSED"};
 
    // Attributes ----------------------------------------------------
 
-   /**
-    * The state lock.
-    */
+   /** The state lock. */
    protected final Object stateLock = new Object();
 
-   /**
-    * The state.
-    */
+   /** The state. */
    protected int state;
 
-   /**
-    * The invocation count.
-    */
+   /** The invocation count. */
    protected int invocations = 0;
 
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
 
-   /**
-    * Create a valve in the closed state
-    */
+   /** Create a valve in the closed state */
    public Valve()
    {
       this(CLOSED);
@@ -125,9 +110,7 @@
       return true;
    }
 
-   /**
-    * Invoked after an invocation
-    */
+   /** Invoked after an invocation */
    public void afterInvocation()
    {
       synchronized (stateLock)
@@ -137,17 +120,13 @@
       }
    }
 
-   /**
-    * Return the state.
-    */
+   /** Return the state. */
    public int getState()
    {
       return state;
    }
 
-   /**
-    * How many invocations are held in the valve.
-    */
+   /** How many invocations are held in the valve. */
    public int getInvocations()
    {
       return invocations;

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/Context.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/Context.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/Context.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/DelegateContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/DelegateContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/DelegateContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.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.common.context.Context#childIterator(java.lang.String)
-    */
+   /** @see org.jboss.portal.common.context.Context#childIterator(java.lang.String) */
    public Iterator childIterator(String name)
    {
       return children.childIterator(name);
    }
 
-   /**
-    * @see org.jboss.portal.common.context.Context#get(java.lang.String)
-    */
+   /** @see org.jboss.portal.common.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.common.context.Context#put(java.lang.String,
-    *      java.lang.String)
-    */
+   /** @see org.jboss.portal.common.context.Context#put(java.lang.String,java.lang.String) */
    public Context put(String key, String value)
    {
       delegate.put(key, value);

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/NamedContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/NamedContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/context/NamedContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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 context.
-    */
+
+   /** @return Returns the context. */
    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: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Interceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Interceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Interceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.invocation;
 
 /**
@@ -27,8 +28,6 @@
  */
 public interface Interceptor
 {
-   /**
-    * Apply the aspect on this invocation.
-    */
+   /** Apply the aspect on this invocation. */
    void invoke(Invocation invocation) throws Exception, InvocationException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/InterceptorStack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/InterceptorStack.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/InterceptorStack.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.invocation;
 
-import org.jboss.portal.common.invocation.Interceptor;
-
 /**
  * A wrapper for a list of interceptors.
  *

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Invocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Invocation.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/invocation/Invocation.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.invocation;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A generic invocation object.
@@ -51,11 +52,11 @@
    }
 
    /**
-    * Set an attribute on the invocation. The goal of attributes is to exchange data between interceptors.
-    * Indeed they could use the underlying request to exchange informations but it is preferrable to not
-    * put such objects visible in the request as they are private to the aspects.
+    * Set an attribute on the invocation. The goal of attributes is to exchange data between interceptors. Indeed they
+    * could use the underlying request to exchange informations but it is preferrable to not put such objects visible in
+    * the request as they are private to the aspects.
     *
-    * @param name the attribute name
+    * @param name  the attribute name
     * @param value the attribute value
     * @throws IllegalArgumentException if the attribute name is null
     */
@@ -111,8 +112,8 @@
    }
 
    /**
-    * Invoke the next interceptor in the chain. If the end of the chain is reached then the <code>dispatch()</code>
-    * is invoked.
+    * Invoke the next interceptor in the chain. If the end of the chain is reached then the <code>dispatch()</code> is
+    * invoked.
     */
    public void invokeNext() throws Exception, InvocationException
    {
@@ -142,12 +143,11 @@
    }
 
    /**
-    * Execute the invocation through the chain of interceptors.
-    * <code>InvocationException</code> should be raised for checked exception.
-    * <code>InvocationRuntimeException</code> should be raised for for non checked exception.
-    * <code>RuntimeException</code> should not be raised and are considered to be programmation errors when they go through
-    * the chain, so any code in the chain should not throw instances of <code>RuntimeException</code>.
-    *
+    * Execute the invocation through the chain of interceptors. <code>InvocationException</code> should be raised for
+    * checked exception. <code>InvocationRuntimeException</code> should be raised for for non checked exception.
+    * <code>RuntimeException</code> should not be raised and are considered to be programmation errors when they go
+    * through the chain, so any code in the chain should not throw instances of <code>RuntimeException</code>.
+    * <p/>
     * When the end of the chain is reached the <code>dispatch()</code> method is invoked.
     */
    public void invoke(Interceptor[] newInterceptors) throws Exception, InvocationException
@@ -178,9 +178,7 @@
       }
    }
 
-   /**
-    * Dispatch the call to the target.
-    */
+   /** Dispatch the call to the target. */
    protected abstract void dispatch() throws Exception, InvocationException;
 }
 

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/LoaderRepositorySelector.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/LoaderRepositorySelector.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/LoaderRepositorySelector.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.logging;
 
 import org.apache.log4j.Hierarchy;
@@ -58,9 +59,7 @@
    private static LoggerRepository defaultRepository;
    private static Logger log = Logger.getLogger(LoaderRepositorySelector.class);
 
-   /**
-    * Register with this repository selector.
-    */
+   /** Register with this repository selector. */
    public static synchronized void register(ClassLoader classloader, Loader loader, String pathToLog4jFile)
    {
       if (classloader == null)

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/Log4JWriter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/Log4JWriter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/logging/Log4JWriter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.logging;
 
-import org.apache.log4j.Logger;
 import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -43,9 +44,7 @@
    /** The logging level. */
    private Level level;
 
-   /**
-    * @throws IllegalArgumentException if log or level is null
-    */
+   /** @throws IllegalArgumentException if log or level is null */
    public Log4JWriter(Logger log, Level level) throws IllegalArgumentException
    {
       if (log == null)

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/JavaBeanModelMBeanBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/JavaBeanModelMBeanBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/JavaBeanModelMBeanBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,26 +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.common.mx;
 
+import javax.management.Descriptor;
+import javax.management.modelmbean.ModelMBeanAttributeInfo;
+import javax.management.modelmbean.ModelMBeanConstructorInfo;
+import javax.management.modelmbean.ModelMBeanInfo;
+import javax.management.modelmbean.ModelMBeanInfoSupport;
+import javax.management.modelmbean.ModelMBeanNotificationInfo;
+import javax.management.modelmbean.ModelMBeanOperationInfo;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -30,14 +38,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.management.Descriptor;
-import javax.management.modelmbean.ModelMBeanAttributeInfo;
-import javax.management.modelmbean.ModelMBeanConstructorInfo;
-import javax.management.modelmbean.ModelMBeanInfo;
-import javax.management.modelmbean.ModelMBeanInfoSupport;
-import javax.management.modelmbean.ModelMBeanNotificationInfo;
-import javax.management.modelmbean.ModelMBeanOperationInfo;
- 
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -45,7 +45,7 @@
  * @version $Revision$
  */
 public class JavaBeanModelMBeanBuilder
-{ 
+{
    private final static String CURRENCY_TIME_LIMIT = "currencyTimeLimit";
    private final static String GET_METHOD = "getMethod";
    private final static String SET_METHOD = "setMethod";
@@ -84,7 +84,7 @@
       Set beanMethods = new HashSet();
 
       //
-      for (Class c = from;c != null && !c.equals(to);c = c.getSuperclass())
+      for (Class c = from; c != null && !c.equals(to); c = c.getSuperclass())
       {
          Method[] methods = c.getDeclaredMethods();
          for (int i = 0; i < methods.length; i++)
@@ -92,72 +92,72 @@
             Method method = methods[i];
             int modifiers = method.getModifiers();
             if (Modifier.isPublic(modifiers) &&
-                !Modifier.isAbstract(modifiers) &&
-                !Modifier.isStatic(modifiers))
+               !Modifier.isAbstract(modifiers) &&
+               !Modifier.isStatic(modifiers))
             {
                String methodName = method.getName();
                Class returnType = method.getReturnType();
                Class[] parameterTypes = method.getParameterTypes();
                if (methodName.startsWith("get") &&
-                   !void.class.equals(returnType) &&
-                   parameterTypes.length == 0 &&
-                   methodName.length() > 3)
+                  !void.class.equals(returnType) &&
+                  parameterTypes.length == 0 &&
+                  methodName.length() > 3)
                {
                   String propertyName = methodName.substring(3);
                   Method beanSetter = (Method)beanSetters.get(propertyName);
                   if (beanSetter != null && !beanSetter.getParameterTypes()[0].equals(returnType))
                   {
                      throw new IllegalArgumentException("Property " + propertyName + " has a setter" +
-                     " type " + beanSetter.getParameterTypes()[0] + " different from the corresponding" +
-                     " getter type " + returnType);
+                        " type " + beanSetter.getParameterTypes()[0] + " different from the corresponding" +
+                        " getter type " + returnType);
                   }
                   Method beanGetter = (Method)beanGetters.get(propertyName);
                   if (beanGetter != null)
                   {
                      throw new IllegalArgumentException("Property " + propertyName + " has two getters " +
-                     beanGetter + " and " + method);
+                        beanGetter + " and " + method);
                   }
                   beanGetters.put(propertyName, method);
                }
                else if (methodName.startsWith("is") &&
-                        !void.class.equals(returnType) &&
-                        parameterTypes.length == 0 &&
-                        methodName.length() > 2)
+                  !void.class.equals(returnType) &&
+                  parameterTypes.length == 0 &&
+                  methodName.length() > 2)
                {
                   String propertyName = methodName.substring(2);
                   Method beanSetter = (Method)beanSetters.get(propertyName);
                   if (beanSetter != null && !beanSetter.getParameterTypes()[0].equals(returnType))
                   {
                      throw new IllegalArgumentException("Property " + propertyName + " has a setter" +
-                     " type " + beanSetter.getParameterTypes()[0] + " different from the corresponding" +
-                     " getter type " + returnType);
+                        " type " + beanSetter.getParameterTypes()[0] + " different from the corresponding" +
+                        " getter type " + returnType);
                   }
                   Method beanGetter = (Method)beanGetters.get(propertyName);
                   if (beanGetter != null)
                   {
                      throw new IllegalArgumentException("Property " + propertyName + " has two getters " +
-                     beanGetter + " and " + method);
+                        beanGetter + " and " + method);
                   }
                   beanGetters.put(propertyName, method);
                }
                else if (methodName.startsWith("set") &&
-                        void.class.equals(returnType) &&
-                        parameterTypes.length == 1 &&
-                        methodName.length() > 3)
+                  void.class.equals(returnType) &&
+                  parameterTypes.length == 1 &&
+                  methodName.length() > 3)
                {
                   String propertyName = methodName.substring(3);
                   Method beanGetter = (Method)beanGetters.get(propertyName);
                   if (beanGetter != null && !beanGetter.getReturnType().equals(parameterTypes[0]))
                   {
                      throw new IllegalArgumentException("Property " + propertyName + " has a setter" +
-                     " type " + parameterTypes[0] + " different from the corresponding" +
-                     " getter type " + beanGetter.getReturnType());
+                        " type " + parameterTypes[0] + " different from the corresponding" +
+                        " getter type " + beanGetter.getReturnType());
                   }
                   Method beanSetter = (Method)beanSetters.get(propertyName);
                   if (beanSetter != null)
                   {
                      throw new IllegalArgumentException("Property " + propertyName + " cannot have two setters " +
-                     beanSetter + " and " + method);
+                        beanSetter + " and " + method);
                   }
                   beanSetters.put(propertyName, method);
                }
@@ -240,17 +240,13 @@
       }
    }
 
-   /**
-    * Remove an interface from the management interface.
-    */
+   /** Remove an interface from the management interface. */
    public void remove(Class itf)
    {
       throw new UnsupportedOperationException("To be implemented if useful, just a placeholder now");
    }
 
-   /**
-    * Generates and returns the management interface.
-    */
+   /** Generates and returns the management interface. */
    public ModelMBeanInfo getInfo()
    {
       // Assemble the mbean info

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/Listener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/Listener.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/mx/Listener.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.mx;
 
+import org.apache.log4j.Logger;
+
 import javax.management.InstanceNotFoundException;
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanServer;
@@ -29,8 +32,6 @@
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
 
-import org.apache.log4j.Logger;
-
 /**
  * Helper class that filter and listen notifications and help to registration.
  *
@@ -100,17 +101,13 @@
       }
    }
 
-   /**
-    * Returns true by default.
-    */
+   /** Returns true by default. */
    public boolean isNotificationEnabled(Notification notification)
    {
       return true;
    }
 
-   /**
-    * Does not perform anything by default.
-    */
+   /** Does not perform anything by default. */
    public void handleNotification(Notification notification, Object handback)
    {
    }

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/Application_XWWWFormURLEncodedFormat.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/Application_XWWWFormURLEncodedFormat.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/Application_XWWWFormURLEncodedFormat.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.net;
 
 import java.io.IOException;
 
 /**
- * Provide fast encoding to the application/x-www-form-urlencoded MIME format for a specified
- * charset.
+ * Provide fast encoding to the application/x-www-form-urlencoded MIME format for a specified charset.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigationProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigationProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigationProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.net;
 
+import java.io.IOException;
 import java.net.URL;
-import java.io.IOException;
 
 /**
  * Defines an interface that provides navigation for URLs.
@@ -35,10 +36,10 @@
    /**
     * Visit all the children recursively.
     *
-    * @param url the target url
+    * @param url     the target url
     * @param visitor the visitor
     * @throws IllegalArgumentException if an argument is null or if the url is not accepted
-    * @throws IOException
-s    */
+    * @throws IOException              s
+    */
    void visit(URL url, URLVisitor visitor) throws IllegalArgumentException, IOException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLNavigator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.net;
 
 import org.jboss.portal.common.net.file.FileURLNavigationProvider;
 import org.jboss.portal.common.net.jar.JarURLNavigationProvider;
 
+import java.io.IOException;
 import java.net.URL;
-import java.io.IOException;
 
 /**
  * The URLNavigator class is a registry for various URLNavigationProvider.

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLVisitor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLVisitor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/URLVisitor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.net;
 
 import java.net.URL;
@@ -34,7 +35,7 @@
    /**
     * Signal the visitor enters a directory.
     *
-    * @param url the dir URL
+    * @param url  the dir URL
     * @param name the dir name
     */
    void startDir(URL url, String name);
@@ -42,7 +43,7 @@
    /**
     * Signals the visitor leavers a directory.
     *
-    * @param url the dir URL
+    * @param url  the dir URL
     * @param name the dir name
     */
    void endDir(URL url, String name);
@@ -50,7 +51,7 @@
    /**
     * Signals the visitor there is a file.
     *
-    * @param url the file URL
+    * @param url  the file URL
     * @param name the file name
     */
    void file(URL url, String name);

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/file/FileURLNavigationProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/file/FileURLNavigationProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/file/FileURLNavigationProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.net.file;
 
+import org.jboss.logging.Logger;
 import org.jboss.portal.common.net.URLNavigationProvider;
 import org.jboss.portal.common.net.URLVisitor;
-import org.jboss.logging.Logger;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
-import java.net.URL;
-import java.io.IOException;
-import java.io.File;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.net.jar;
 
 import org.jboss.portal.common.net.URLNavigationProvider;
 import org.jboss.portal.common.net.URLVisitor;
 import org.jboss.portal.common.util.Jar;
 
-import java.net.URL;
+import java.io.IOException;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -79,7 +80,7 @@
       entries.add(root);
 
       // Add all the other entries under the root to the list
-      for (Iterator i = Jar.iterator(jarFile);i.hasNext();)
+      for (Iterator i = Jar.iterator(jarFile); i.hasNext();)
       {
          Jar.EntryInfo current = (Jar.EntryInfo)i.next();
          if (current.isDescendantOf(root))
@@ -162,27 +163,31 @@
          this.root = root;
          this.atoms = new LinkedList();
       }
+
       int size()
       {
          return atoms.size();
       }
+
       void push(String atom)
       {
          atoms.addLast(atom);
       }
+
       String pop()
       {
          return (String)atoms.removeLast();
       }
+
       URL getURL(boolean dir) throws MalformedURLException
       {
          StringBuffer tmp = new StringBuffer(jarURL.toString()).append("!");
-         for (int i = 0;i < root.size() - 1;i++)
+         for (int i = 0; i < root.size() - 1; i++)
          {
             String atom = root.get(i);
             tmp.append("/").append(atom);
          }
-         for (int i = 0;i < atoms.size();i++)
+         for (int i = 0; i < atoms.size(); i++)
          {
             String atom = (String)atoms.get(i);
             tmp.append("/").append(atom);
@@ -199,6 +204,7 @@
    {
       final String name;
       final ArrayList children;
+
       public Node(String name)
       {
          this.name = name;

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/path/RelativePathParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/path/RelativePathParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/path/RelativePathParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.path;
 
 /**
- * Utility class to pull parse a relative path. 
+ * Utility class to pull parse a relative path.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -44,42 +45,32 @@
    public static final int NONE = 0;
 
    /**
-    * The recognized token is up. The values returned by <code>getOffset()</code> and
-    * <code>getLength()</code> is undertermined.
+    * The recognized token is up. The values returned by <code>getOffset()</code> and <code>getLength()</code> is
+    * undertermined.
     */
    public static final int UP = 1;
 
    /**
-    * The recognized token is down. The values returned by <code>getOffset()</code> and
-    * <code>getLength()</code> determine the token string value.
+    * The recognized token is down. The values returned by <code>getOffset()</code> and <code>getLength()</code>
+    * determine the token string value.
     */
    public static final int DOWN = 2;
 
    // Variables ********************************************************************************************************
 
-   /**
-    * The path being parsed.
-    */
+   /** The path being parsed. */
    private final String path;
 
-   /**
-    * The current index of parsing.
-    */
+   /** The current index of parsing. */
    private int current;
 
-   /**
-    * The current internal offset.
-    */
+   /** The current internal offset. */
    private int previous;
 
-   /**
-    * The offset value when a down token is recognized.
-    */
+   /** The offset value when a down token is recognized. */
    private int offset;
 
-   /**
-    * The length value when a down token is recognized.
-    */
+   /** The length value when a down token is recognized. */
    private int length;
 
    public RelativePathParser(String path)
@@ -110,7 +101,7 @@
          char c = path.charAt(current++);
          switch (c)
          {
-            case '.':
+            case'.':
             {
                switch (state)
                {
@@ -128,7 +119,7 @@
                }
                break;
             }
-            case '/':
+            case'/':
             {
                switch (state)
                {

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/AdapterPlugin.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/AdapterPlugin.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/AdapterPlugin.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.plugin;
 
 /**
@@ -29,13 +30,9 @@
  */
 public interface AdapterPlugin extends Plugin
 {
-   /**
-    * Return the classname adapted by the adapter. 
-    */
+   /** Return the classname adapted by the adapter. */
    Class getAdaptedClass();
 
-   /**
-    * Return the adapter instance.
-    */
+   /** Return the adapter instance. */
    Object getAdapter();
 }

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/PluginContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/PluginContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/plugin/PluginContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.plugin;
 
 import java.util.Set;
@@ -29,13 +30,9 @@
  */
 public interface PluginContainer
 {
-   /**
-    * Return a plugin.
-    */
+   /** Return a plugin. */
    Plugin getPlugin(String key);
 
-   /**
-    * Return all the known plugins.
-    */
+   /** Return all the known plugins. */
    Set getPluginKeys();
 }

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/CombinedPreferencesResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/CombinedPreferencesResolver.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/CombinedPreferencesResolver.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.prefs;
 
+import org.jboss.portal.common.value.Value;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jboss.portal.common.value.Value;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -57,7 +58,7 @@
       Value value = null;
 
       // Get the pref
-      for (int i = array.length - 1;i >= 0;i--)
+      for (int i = array.length - 1; i >= 0; i--)
       {
          Preferences prefs = array[i];
 
@@ -88,7 +89,7 @@
       }
 
       //
-      for (int i = array.length - 1;i >= 0;i--)
+      for (int i = array.length - 1; i >= 0; i--)
       {
          Preferences prefs = array[i];
          if (prefs.isReadOnly(key))
@@ -105,7 +106,7 @@
    {
       // Perform merge
       Set keys = new HashSet();
-      for (int i = 0;i < array.length;i++)
+      for (int i = 0; i < array.length; i++)
       {
          Set tmp = array[i].getKeys();
          keys.addAll(tmp);

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/MapPreferences.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/MapPreferences.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/MapPreferences.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.prefs;
 
 import org.jboss.portal.common.value.Value;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/Preferences.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/Preferences.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/Preferences.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.prefs;
 
 import org.jboss.portal.common.value.ValueMap;
@@ -42,13 +43,13 @@
    boolean isReadOnly(String key) throws IllegalArgumentException;
 
    /**
-    * Update the read only value for the given key. Implementation can throw
-    * an unsupported operation exception when it is abnormal to perform an update.
+    * Update the read only value for the given key. 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 readOnly the new read only value
     * @throws UnsupportedOperationException if the operation is not supported
-    * @throws IllegalArgumentException if the key is null
+    * @throws IllegalArgumentException      if the key is null
     */
    void setReadOnly(String key, boolean readOnly) throws IllegalArgumentException, UnsupportedOperationException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/PreferencesResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/PreferencesResolver.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/prefs/PreferencesResolver.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.prefs;
 
-import org.jboss.portal.common.value.Value; 
+import org.jboss.portal.common.value.Value;
 
 import java.util.Set;
 
@@ -37,7 +38,7 @@
     * Return a preference among the sets or null if no suitable preference is found.
     *
     * @param array
-    * @param key the requested key
+    * @param key   the requested key
     * @return the found preference or null
     * @throws IllegalArgumentException if the key or the array is null
     */
@@ -47,7 +48,7 @@
     * Say if the preference is marked as read only.
     *
     * @param array
-    * @param key the requested key
+    * @param key   the requested key
     * @return the read only value
     * @throws IllegalArgumentException if the key or the array is null
     */

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/JBossService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/JBossService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/system/JBossService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.system;
 
-public interface JBossService {
+public interface JBossService
+{
 
    public void create() throws Exception;
 

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.transaction;
 
 /**
@@ -29,17 +30,21 @@
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 8968893103336776336L;
+
    public TransactionException()
    {
    }
+
    public TransactionException(Throwable cause)
    {
       super(cause);
    }
+
    public TransactionException(String message)
    {
       super(message);
    }
+
    public TransactionException(String message, Throwable cause)
    {
       super(message, cause);

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionManagerProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionManagerProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/TransactionManagerProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.transaction;
 
-import javax.transaction.TransactionManager;
 import javax.naming.InitialContext;
+import javax.transaction.TransactionManager;
 
 /**
  * Implementations provides access to a transaction manager.
@@ -40,9 +41,7 @@
     */
    TransactionManager getTransactionManager() throws Exception;
 
-   /**
-    * JBoss transaction manager provider implementation.
-    */
+   /** JBoss transaction manager provider implementation. */
    TransactionManagerProvider JBOSS_PROVIDER = new TransactionManagerProvider()
    {
       public TransactionManager getTransactionManager() throws Exception

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/Transactions.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/Transactions.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/transaction/Transactions.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.transaction;
 
+import org.apache.log4j.Logger;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import javax.transaction.NotSupportedException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.RollbackException;
 
-import org.apache.log4j.Logger;
-
 /**
  * Utility class for managing transactions.
  *
@@ -60,7 +61,7 @@
     * Apply the transaction type before the unit of work.
     *
     * @param type the transaction type
-    * @param tm the transaction manager
+    * @param tm   the transaction manager
     * @return the new transaction if one has been started.
     * @throws TransactionException
     * @throws IllegalArgumentException if the type or the transaction manager is null
@@ -94,8 +95,8 @@
    /**
     * Apply the transaction type after the unit of work has been done.
     *
-    * @param type the transaction type
-    * @param tm the transaction manager
+    * @param type  the transaction type
+    * @param tm    the transaction manager
     * @param oldTx the old transaction if it is not null
     * @throws TransactionException
     * @throws IllegalArgumentException if the type of the transaction manager is null
@@ -141,11 +142,11 @@
    /**
     * Apply the transaction type around the unit of work.
     *
-    * @param type the transaction type
-    * @param tm the transaction manager
+    * @param type     the transaction type
+    * @param tm       the transaction manager
     * @param runnable the unit of work
     * @return the object returned by the runnable object
-    * @throws NestedException wraps any exception throws by the runnable object
+    * @throws NestedException          wraps any exception throws by the runnable object
     * @throws TransactionException
     * @throws IllegalArgumentException if any method argument is null
     */
@@ -226,7 +227,7 @@
       {
          if (throwable instanceof Error)
          {
-            throw (Error)throwable;
+            throw(Error)throwable;
          }
          else
          {
@@ -330,9 +331,9 @@
    /**
     * Mark the active transaction for this thread as rollback only
     *
-    * @see #setRollbackOnly(javax.transaction.Transaction)
     * @param tm the transaction manager
     * @throws IllegalArgumentException if the tm is null
+    * @see #setRollbackOnly(javax.transaction.Transaction)
     */
    public static void setRollbackOnly(TransactionManager tm) throws IllegalArgumentException, TransactionException
    {
@@ -389,8 +390,8 @@
    }
 
    /**
-    * Terminate the active transaction for this thread. If the transaction is marked for rollback
-    * then it is rollbacked otherwise it is commited.
+    * Terminate the active transaction for this thread. If the transaction is marked for rollback then it is rollbacked
+    * otherwise it is commited.
     *
     * @param tm the transaction manager
     * @return true if commit happened, false otherwise
@@ -407,14 +408,14 @@
          int status = tm.getStatus();
          switch (status)
          {
-         case Status.STATUS_MARKED_ROLLBACK:
-            tm.rollback();
-            return false;
-         case Status.STATUS_ACTIVE:
-            tm.commit();
-            return true;
-         default:
-            throw new TransactionException("Abnormal status for ending a tx " + STATUS_NAMES[status]);
+            case Status.STATUS_MARKED_ROLLBACK:
+               tm.rollback();
+               return false;
+            case Status.STATUS_ACTIVE:
+               tm.commit();
+               return true;
+            default:
+               throw new TransactionException("Abnormal status for ending a tx " + STATUS_NAMES[status]);
          }
       }
       catch (SystemException e)
@@ -541,12 +542,15 @@
       void txBefore(TransactionManager tm, Transaction oldTx)
       {
       }
+
       void txAfter(TransactionManager tm, Transaction oldTx)
       {
       }
+
       void noTxBefore(TransactionManager tm)
       {
       }
+
       void noTxAfter(TransactionManager tm)
       {
       }
@@ -558,6 +562,7 @@
       {
          resume(tm, oldTx);
       }
+
       void txAfter(TransactionManager tm, Transaction oldTx)
       {
          try
@@ -569,9 +574,11 @@
             log.error("Problem when suspending transaction", ignore);
          }
       }
+
       void noTxBefore(TransactionManager tm)
       {
       }
+
       void noTxAfter(TransactionManager tm)
       {
       }
@@ -583,6 +590,7 @@
       {
          resume(tm, oldTx);
       }
+
       void txAfter(TransactionManager tm, Transaction oldTx)
       {
          try
@@ -594,10 +602,12 @@
             log.error("Problem when suspending transaction", ignore);
          }
       }
+
       void noTxBefore(TransactionManager tm) throws TransactionException
       {
          begin(tm);
       }
+
       void noTxAfter(TransactionManager tm)
       {
          try
@@ -617,6 +627,7 @@
       {
          begin(tm);
       }
+
       void txAfter(TransactionManager tm, Transaction oldTx)
       {
          try
@@ -628,10 +639,12 @@
             log.error("Problem when ending transaction", ignore);
          }
       }
+
       void noTxBefore(TransactionManager tm) throws TransactionException
       {
          begin(tm);
       }
+
       void noTxAfter(TransactionManager tm)
       {
          try
@@ -651,13 +664,16 @@
       {
          resume(tm, oldTx);
       }
+
       void txAfter(TransactionManager tm, Transaction oldTx)
       {
       }
+
       void noTxBefore(TransactionManager tm) throws TransactionException
       {
          throw new TransactionException("No incoming transaction");
       }
+
       void noTxAfter(TransactionManager tm)
       {
          throw new UnsupportedOperationException("Should never ne called");
@@ -670,13 +686,16 @@
       {
          throw new TransactionException("Need no incoming transaction");
       }
+
       void txAfter(TransactionManager tm, Transaction oldTx)
       {
          throw new UnsupportedOperationException("Should never ne called");
       }
+
       void noTxBefore(TransactionManager tm)
       {
       }
+
       void noTxAfter(TransactionManager tm)
       {
       }

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Base64.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Base64.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Base64.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,40 +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.common.util;
 
 /**
  * <p>Encodes and decodes to and from Base64 and URL-safe Base64 encodings. URL-safe Base64 encoding being defined here
- * as standard Base64 encoding with the following modifications:</p>
- * <ul>
- * <li>use '-' and '_' instead of '+' and '/'</li>
- * <li>no line feeds</li>
- * <li>padding character is '*' instead of '='</li>
- * </ul>
+ * as standard Base64 encoding with the following modifications:</p> <ul> <li>use '-' and '_' instead of '+' and
+ * '/'</li> <li>no line feeds</li> <li>padding character is '*' instead of '='</li> </ul>
  * <p/>
- * <p>Based on version 2.1 of the Base64 class developed by Robert Harder (public domain).
- * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
- * periodically to check for updates or to contribute improvements.
- * </p>
+ * <p>Based on version 2.1 of the Base64 class developed by Robert Harder (public domain). Please visit <a
+ * href="http://iharder.net/base64">http://iharder.net/base64</a> periodically to check for updates or to contribute
+ * improvements. </p>
  *
  * @author <a href="mailto:rob at iharder.net">Robert Harder</a>
  * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
@@ -101,15 +97,12 @@
    private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
    private final static byte PADDING_CHAR_ENC = -1; // Indicates equals sign in encoding
 
-   /**
-    * Translates a value to either its 6-bit reconstruction value
-    * or a negative number indicating some other meaning.
-    */
+   /** Translates a value to either its 6-bit reconstruction value or a negative number indicating some other meaning. */
    private byte[] DECODABET;
 
    /**
-    * Translates a Base64 value to either its 6-bit reconstruction value
-    * or a negative number indicating some other meaning.
+    * Translates a Base64 value to either its 6-bit reconstruction value or a negative number indicating some other
+    * meaning.
     */
    private final static byte[] BASE64_DECODABET =
       {
@@ -137,8 +130,8 @@
       };
 
    /**
-    * Translates a URL-modified Base64 value to either its 6-bit reconstruction value
-    * or a negative number indicating some other meaning.
+    * Translates a URL-modified Base64 value to either its 6-bit reconstruction value or a negative number indicating
+    * some other meaning.
     */
    private final static byte[] URL_SAFE_DECODABET =
       {
@@ -221,17 +214,12 @@
 
 
    /**
-    * Encodes up to three bytes of the array <var>source</var>
-    * and writes the resulting four Base64 bytes to <var>destination</var>.
-    * The source and destination arrays can be manipulated
-    * anywhere along their length by specifying
-    * <var>srcOffset</var> and <var>destOffset</var>.
-    * This method does not check to make sure your arrays
-    * are large enough to accomodate <var>srcOffset</var> + 3 for
-    * the <var>source</var> array or <var>destOffset</var> + 4 for
-    * the <var>destination</var> array.
-    * The actual number of significant bytes in your array is
-    * given by <var>numSigBytes</var>.
+    * Encodes up to three bytes of the array <var>source</var> and writes the resulting four Base64 bytes to
+    * <var>destination</var>. The source and destination arrays can be manipulated anywhere along their length by
+    * specifying <var>srcOffset</var> and <var>destOffset</var>. This method does not check to make sure your arrays are
+    * large enough to accomodate <var>srcOffset</var> + 3 for the <var>source</var> array or <var>destOffset</var> + 4
+    * for the <var>destination</var> array. The actual number of significant bytes in your array is given by
+    * <var>numSigBytes</var>.
     *
     * @param source      the array to convert
     * @param srcOffset   the index where conversion begins
@@ -301,9 +289,9 @@
     * Encodes a byte array into Base64 notation.
     *
     * @param source             The data to convert
-    * @param useURLSafeEncoding <code>true</code> to use '-', '_' instead of '+', '/' in the alphabet and '*' instead
-    *                           of '=' for padding to generate a URL-safe encoding. <i>Note: Technically, this makes
-    *                           your encoding non-compliant.</i>
+    * @param useURLSafeEncoding <code>true</code> to use '-', '_' instead of '+', '/' in the alphabet and '*' instead of
+    *                           '=' for padding to generate a URL-safe encoding. <i>Note: Technically, this makes your
+    *                           encoding non-compliant.</i>
     */
    public static String encodeBytes(byte[] source, boolean useURLSafeEncoding)
    {
@@ -316,9 +304,9 @@
     * @param source             The data to convert
     * @param off                Offset in array where conversion should begin
     * @param len                Length of data to convert
-    * @param useURLSafeEncoding <code>true</code> to use '-', '_' instead of '+', '/' in the alphabet and '*' instead
-    *                           of '=' for padding to generate a URL-safe encoding. <i>Note: Technically, this makes
-    *                           your encoding non-compliant.</i>
+    * @param useURLSafeEncoding <code>true</code> to use '-', '_' instead of '+', '/' in the alphabet and '*' instead of
+    *                           '=' for padding to generate a URL-safe encoding. <i>Note: Technically, this makes your
+    *                           encoding non-compliant.</i>
     */
    public static String encodeBytes(byte[] source, int off, int len, boolean useURLSafeEncoding)
    {
@@ -366,18 +354,12 @@
 /* ********  D E C O D I N G   M E T H O D S  ******** */
 
    /**
-    * Decodes four bytes from array <var>source</var>
-    * and writes the resulting bytes (up to three of them)
-    * to <var>destination</var>.
-    * The source and destination arrays can be manipulated
-    * anywhere along their length by specifying
-    * <var>srcOffset</var> and <var>destOffset</var>.
-    * This method does not check to make sure your arrays
-    * are large enough to accomodate <var>srcOffset</var> + 4 for
-    * the <var>source</var> array or <var>destOffset</var> + 3 for
-    * the <var>destination</var> array.
-    * This method returns the actual number of bytes that
-    * were converted from the Base64 encoding.
+    * Decodes four bytes from array <var>source</var> and writes the resulting bytes (up to three of them) to
+    * <var>destination</var>. The source and destination arrays can be manipulated anywhere along their length by
+    * specifying <var>srcOffset</var> and <var>destOffset</var>. This method does not check to make sure your arrays are
+    * large enough to accomodate <var>srcOffset</var> + 4 for the <var>source</var> array or <var>destOffset</var> + 3
+    * for the <var>destination</var> array. This method returns the actual number of bytes that were converted from the
+    * Base64 encoding.
     *
     * @param source      the array to convert
     * @param srcOffset   the index where conversion begins
@@ -450,8 +432,7 @@
    }   // end decodeToBytes
 
    /**
-    * Very low-level access to decoding ASCII characters in
-    * the form of a byte array.
+    * Very low-level access to decoding ASCII characters in the form of a byte array.
     *
     * @param source The Base64 encoded data
     * @param off    The offset of where to begin decoding
@@ -507,8 +488,7 @@
    }
 
    /**
-    * Very low-level access to decoding ASCII characters in
-    * the form of a byte array.
+    * Very low-level access to decoding ASCII characters in the form of a byte array.
     *
     * @param source                 The Base64 encoded data
     * @param off                    The offset of where to begin decoding

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/CollectionBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/CollectionBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/CollectionBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.Collection;
 
 /**
  * An helper to build collection of object in a simple manner.

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/EmptyResourceBundle.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/EmptyResourceBundle.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/EmptyResourceBundle.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
+import java.util.Enumeration;
 import java.util.ResourceBundle;
-import java.util.Enumeration;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Exceptions.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Exceptions.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Exceptions.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
- 
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -34,7 +35,7 @@
       {
          throw new IllegalArgumentException("Cannot unwrap null throwable");
       }
-      for (Throwable current = throwable;current != null;current = current.getCause())
+      for (Throwable current = throwable; current != null; current = current.getCause())
       {
          throwable = current;
       }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/JMX.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/JMX.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/JMX.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import org.apache.log4j.Logger;
@@ -63,9 +64,7 @@
       }
    }
 
-   /**
-    * ObjectName comparator based on canonical name lexicography.
-    */
+   /** ObjectName comparator based on canonical name lexicography. */
    public static Comparator OBJECT_NAME_COMPARATOR = new Comparator()
    {
       public int compare(Object o1, Object o2)
@@ -138,7 +137,7 @@
     * @return a MBeanProxy for the specified MBean if it exists
     * @throws IllegalArgumentException if the given name is not a valid ObjectName
     * @throws RuntimeException         if the MBean couldn't be retrieved
-    * @see #getMBeanProxy(Class, javax.management.ObjectName, javax.management.MBeanServer)
+    * @see #getMBeanProxy(Class,javax.management.ObjectName,javax.management.MBeanServer)
     * @since 2.4
     */
    public static Object getMBeanProxy(Class clazz, String name)

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Jar.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Jar.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Jar.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
-import java.util.Iterator;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.jar.JarInputStream;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.io.IOException;
-import java.net.URL;
-import java.net.MalformedURLException;
+import java.util.jar.JarInputStream;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -50,7 +51,7 @@
          throw new IllegalArgumentException();
       }
       SortedSet set = new TreeSet(EntryInfo.COMPARATOR);
-      for (Enumeration e = file.entries();e.hasMoreElements();)
+      for (Enumeration e = file.entries(); e.hasMoreElements();)
       {
          JarEntry entry = (JarEntry)e.nextElement();
          EntryInfo info = new EntryInfo(entry);
@@ -66,7 +67,7 @@
          throw new IllegalArgumentException();
       }
       SortedSet set = new TreeSet(EntryInfo.COMPARATOR);
-      for (JarEntry entry = in.getNextJarEntry();entry !=null;entry = in.getNextJarEntry())
+      for (JarEntry entry = in.getNextJarEntry(); entry != null; entry = in.getNextJarEntry())
       {
          Jar.EntryInfo info = new EntryInfo(entry);
          set.add(info);
@@ -74,17 +75,13 @@
       return set.iterator();
    }
 
-   /**
-    * Enhance jar entry object by adding more info.
-    */
+   /** Enhance jar entry object by adding more info. */
    public static class EntryInfo
    {
 
       private final JarEntry entry;
       private final List atoms;
-      /**
-       * Compares jar entries.
-       */
+      /** Compares jar entries. */
       public static final Comparator COMPARATOR = new Comparator()
       {
          public int compare(Object o1, Object o2)
@@ -262,5 +259,4 @@
    }
 
 
-
 }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LazyMap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LazyMap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LazyMap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
-import java.util.Map;
-import java.util.Set;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -39,9 +40,7 @@
    /** . */
    private boolean modified;
 
-   /**
-    * Create the delegate. There are no guarantees that this method will be called only once.
-    */
+   /** Create the delegate. There are no guarantees that this method will be called only once. */
    protected abstract Map createDelegate();
 
    public boolean isModified()

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Loader.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Loader.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Loader.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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$
@@ -33,12 +34,10 @@
 public interface Loader
 {
 
-   /** Helper to validate name. */ 
+   /** Helper to validate name. */
    String REGEX_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 location);
 
    /**

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LoaderResource.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LoaderResource.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LoaderResource.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import org.w3c.dom.Document;
@@ -27,11 +28,11 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
 import java.util.Properties;
-import java.util.Iterator;
 
 /**
  * Represent a resource that may or not exist.
@@ -113,7 +114,7 @@
             DocumentBuilder builder = XML.getDocumentBuilderFactory().newDocumentBuilder();
             Document doc = asDocument(builder);
             Element propertiesElt = doc.getDocumentElement();
-            for (Iterator i = XML.getChildren(propertiesElt, "entry").iterator();i.hasNext();)
+            for (Iterator i = XML.getChildren(propertiesElt, "entry").iterator(); i.hasNext();)
             {
                Element entryElt = (Element)i.next();
                String key = entryElt.getAttribute("key");

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocaleInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocaleInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocaleInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import org.apache.log4j.Logger;
@@ -47,34 +48,22 @@
 
    // Static fields ****************************************************************************************************
 
-   /**
-    * The logger.
-    */
+   /** The logger. */
    private static Logger log = Logger.getLogger(LocaleInfo.class);
 
-   /**
-    * The locale info map.
-    */
+   /** The locale info map. */
    private static volatile Infos sharedInfos = createFromAvailableLocales();
 
-   /**
-    * Separator.
-    */
+   /** Separator. */
    private static final String RFC3066_SEPARATOR = "-";
 
-   /**
-    * Valid language tag matcher (see <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a>).
-    */
+   /** Valid language tag matcher (see <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a>). */
    private static final Pattern RFC3066_COMPOUND_LANG_PATTERN = Pattern.compile("(\\p{Lower}{2})(-(\\p{Upper}{2}))?");
 
-   /**
-    * Sorted valid ISO country codes (needed for Arrays.binarySearch).
-    */
+   /** Sorted valid ISO country codes (needed for Arrays.binarySearch). */
    private static final String[] SORTED_ISO_COUNTRIES = Locale.getISOCountries();
 
-   /**
-    * Sorted valid ISO language codes (needed for Arrays.binarySearch).
-    */
+   /** Sorted valid ISO language codes (needed for Arrays.binarySearch). */
    private static final String[] SORTED_ISO_LANGUAGES = Locale.getISOLanguages();
 
    private static final Comparator c = new Comparator()
@@ -97,24 +86,16 @@
 
    // Fields ***********************************************************************************************************
 
-   /**
-    * The parent locale info or null if no parent.
-    */
+   /** The parent locale info or null if no parent. */
    private LocaleInfo parent;
 
-   /**
-    * The relaled locale.
-    */
+   /** The relaled locale. */
    private Locale locale;
 
-   /**
-    * The trailing name used to compute resource bundle name.
-    */
+   /** The trailing name used to compute resource bundle name. */
    private String trailingName;
 
-   /**
-    * The RFC3066 language tag.
-    */
+   /** The RFC3066 language tag. */
    private String rfc3066LangageTag;
 
    // Constructor ******************************************************************************************************
@@ -147,11 +128,10 @@
    }
 
    /**
-    * Retrieves the language identification tag associated to this LocaleInfo as defined by
-    * <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a> limited to 2-letter
-    * language code per ISO standard 639, a "-" (dash) and a 2-letter country code per
-    * ISO 3166 alpha-2 country codes. E.g. "en-US" for American English, "en-GB" for
-    * British English, etc.
+    * Retrieves the language identification tag associated to this LocaleInfo as defined by <a
+    * href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a> limited to 2-letter language code per ISO standard
+    * 639, a "-" (dash) and a 2-letter country code per ISO 3166 alpha-2 country codes. E.g. "en-US" for American
+    * English, "en-GB" for British English, etc.
     *
     * @return a <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a>-compatible language tag.
     * @throws IllegalArgumentException if the given locale is not valid
@@ -163,11 +143,10 @@
    }
 
    /**
-    * Retrieves the language identification tag associated to the specified Locale as defined by
-    * <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a> limited to 2-letter
-    * language code per ISO standard 639, a "-" (dash) and a 2-letter country code per
-    * ISO 3166 alpha-2 country codes. E.g. "en-US" for American English, "en-GB" for
-    * British English, etc.
+    * Retrieves the language identification tag associated to the specified Locale as defined by <a
+    * href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a> limited to 2-letter language code per ISO standard
+    * 639, a "-" (dash) and a 2-letter country code per ISO 3166 alpha-2 country codes. E.g. "en-US" for American
+    * English, "en-GB" for British English, etc.
     *
     * @param locale the locale which language tag is wanted
     * @return a <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a>-compatible language tag.
@@ -223,17 +202,17 @@
    /**
     * <p>Get an info object.</p>
     * <p/>
-    * <p>Whenever the info object cannot be found then it creates a new one and possibly several
-    * since each info object may have a non null parent.</p>
+    * <p>Whenever the info object cannot be found then it creates a new one and possibly several since each info object
+    * may have a non null parent.</p>
     * <p/>
-    * <p>If the infos argument is null, then the static shared infos is used to perform a lookup.
-    * If the lookup returns null then the shared infos is cloned and updated with the newly created
-    * info objects. The operation performed is a copy on write and is thread safe. Note that concurrent
-    * updates may cause the lost of info object in the shared infos.</p>
+    * <p>If the infos argument is null, then the static shared infos is used to perform a lookup. If the lookup returns
+    * null then the shared infos is cloned and updated with the newly created info objects. The operation performed is a
+    * copy on write and is thread safe. Note that concurrent updates may cause the lost of info object in the shared
+    * infos.</p>
     * <p/>
-    * <p>If the infos argument is not null, then it is used to perform a lookup first. If the lookup returns null
-    * then the infos object udpated with the newly created info objects. Note that no cloning of the infos object
-    * is performed.</p>
+    * <p>If the infos argument is not null, then it is used to perform a lookup first. If the lookup returns null then
+    * the infos object udpated with the newly created info objects. Note that no cloning of the infos object is
+    * performed.</p>
     *
     * @param locale the locale
     * @param infos  the infos
@@ -303,9 +282,7 @@
    }
 
 
-   /**
-    * Create an infos object from the set of locales returned by <code>Locale.getAvailableLocales()</code>.
-    */
+   /** Create an infos object from the set of locales returned by <code>Locale.getAvailableLocales()</code>. */
    private static Infos createFromAvailableLocales()
    {
       // Initialize all objects
@@ -319,9 +296,7 @@
       return workInfos;
    }
 
-   /**
-    * Return a collection of all available locale info for the platform.
-    */
+   /** Return a collection of all available locale info for the platform. */
    public static Collection getAll()
    {
       return sharedInfos.unmodifiableList;
@@ -358,11 +333,10 @@
    }
 
    /**
-    * Returns an info object based on the given language identification tag as defined by
-    * <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a> limited to 2-letter
-    * language code per ISO standard 639, a "-" (dash) and a 2-letter country code per
-    * ISO 3166 alpha-2 country codes. E.g. "en-US" for American English, "en-GB" for
-    * British English, etc.
+    * Returns an info object based on the given language identification tag as defined by <a
+    * href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a> limited to 2-letter language code per ISO standard
+    * 639, a "-" (dash) and a 2-letter country code per ISO 3166 alpha-2 country codes. E.g. "en-US" for American
+    * English, "en-GB" for British English, etc.
     *
     * @param languageIdentificationTag the language tag to build the Locale from
     * @return a LocaleInfo associated to the given compound language tag
@@ -402,39 +376,25 @@
    }
 
 
-   /**
-    * Hold the several ways to retrieve infos object.
-    */
+   /** Hold the several ways to retrieve infos object. */
    private static class Infos
    {
-      /**
-       * The info by locale.
-       */
+      /** The info by locale. */
       private Map byLocale;
 
-      /**
-       * The info by locale#toString() code.
-       */
+      /** The info by locale#toString() code. */
       private Map byLocaleCode;
 
-      /**
-       * The info by locale RFC3066 language tag.
-       */
+      /** The info by locale RFC3066 language tag. */
       private Map byRFC3066LanguageTag;
 
-      /**
-       * All the infos.
-       */
+      /** All the infos. */
       private List list;
 
-      /**
-       * All the infos as an unmodifiable list.
-       */
+      /** All the infos as an unmodifiable list. */
       private List unmodifiableList;
 
-      /**
-       * Construct a new info object.
-       */
+      /** Construct a new info object. */
       public Infos()
       {
          this.byLocale = new HashMap();
@@ -444,9 +404,7 @@
          this.unmodifiableList = Collections.unmodifiableList(list);
       }
 
-      /**
-       * Clone the info object state passed as argument.
-       */
+      /** Clone the info object state passed as argument. */
       public Infos(Infos that)
       {
          this.byLocale = new HashMap(that.byLocale);

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedPropertyResourceBundle.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedPropertyResourceBundle.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedPropertyResourceBundle.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
 import java.util.PropertyResourceBundle;
-import java.util.Locale;
-import java.io.InputStream;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/LocalizedString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import org.jboss.logging.Logger;
@@ -38,19 +39,13 @@
 public class LocalizedString
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static final Logger log = Logger.getLogger(LocalizedString.class);
 
-   /**
-    * The descriptions.
-    */
+   /** The descriptions. */
    private Map values;
 
-   /**
-    * The default locale.
-    */
+   /** The default locale. */
    private Locale defaultLocale;
 
    /**
@@ -194,9 +189,7 @@
       }
    }
 
-   /**
-    * Return the default locale of this description.
-    */
+   /** Return the default locale of this description. */
    public Locale getDefaultLocale()
    {
       return defaultLocale;
@@ -205,12 +198,11 @@
    /**
     * Retrieves the localized value most appropriate based on the given desired locales.
     *
-    * @param desiredLocales an array of compound language tags (as defined by
-    *                       <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a>) ordered according to
-    *                       locale preferences.
+    * @param desiredLocales an array of compound language tags (as defined by <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF
+    *                       RFC 3066</a>) ordered according to locale preferences.
     * @return the most appropriate localized value based on locale preferences.
-    * @throws IllegalArgumentException if the array is null or one of the array string
-    *                                  is null or invalid (see #getLocaleFromRFC3066LanguageTag(String))
+    * @throws IllegalArgumentException if the array is null or one of the array string is null or invalid (see
+    *                                  #getLocaleFromRFC3066LanguageTag(String))
     * @since 2.4
     */
    public String getMostAppropriateValueFor(String[] desiredLocales) throws IllegalArgumentException
@@ -223,13 +215,12 @@
     * Retrieves the Locale-String mapping most appropriate based on the given desired locales, which are ordered
     * according to locale preferences.
     *
-    * @param desiredLocales an array of compound language tags (as defined by
-    *                       <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF RFC 3066</a>) ordered according to
-    *                       locale preferences.
-    * @return a Map.Entry representing the most appropriate mapping between Locale and
-    *         localized value, based on locale preferences.
-    * @throws IllegalArgumentException if the array is null or one of the array string
-    *                                  is null or invalid (see {@link LocaleInfo#decodeLocaleInfoFromRFC3066LanguageTag(String)}
+    * @param desiredLocales an array of compound language tags (as defined by <a href="http://www.ietf.org/rfc/rfc3066.txt">IETF
+    *                       RFC 3066</a>) ordered according to locale preferences.
+    * @return a Map.Entry representing the most appropriate mapping between Locale and localized value, based on locale
+    *         preferences.
+    * @throws IllegalArgumentException if the array is null or one of the array string is null or invalid (see {@link
+    *                                  LocaleInfo#decodeLocaleInfoFromRFC3066LanguageTag(String)}
     * @since 2.4
     */
    public Value getPreferredOrBestLocalizedMappingFor(String[] desiredLocales) throws IllegalArgumentException
@@ -288,9 +279,7 @@
       return value;
    }
 
-   /**
-    * A localized value.
-    */
+   /** A localized value. */
    public static class Value
    {
 

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/MapResourceBundle.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/MapResourceBundle.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/MapResourceBundle.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.ResourceBundle;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Enumeration;
-import java.util.Collections;
 
 /**
  * A resource bundle that use a map as content.

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParameterMap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParameterMap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParameterMap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
-import java.util.Map;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -56,7 +57,7 @@
       {
          throw new IllegalArgumentException("Array must not be zero length");
       }
-      for (int i = strings.length - 1;i >= 0;i--)
+      for (int i = strings.length - 1; i >= 0; i--)
       {
          if (strings[i] == null)
          {

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParentChildResourceBundle.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParentChildResourceBundle.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ParentChildResourceBundle.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import java.util.Enumeration;
@@ -28,11 +29,9 @@
 import java.util.ResourceBundle;
 
 /**
- * This resource bundle takes two resource bundle to make one :
- * - The locale of this resource bundle is given by the child.
- * - For a given key present in the child and the parent, the child
- *   value overrides the parent value.
- *
+ * This resource bundle takes two resource bundle to make one : - The locale of this resource bundle is given by the
+ * child. - For a given key present in the child and the parent, the child value overrides the parent value.
+ * <p/>
  * The locale used for the bundle is the child locale.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -49,11 +48,10 @@
    private Map values;
 
    /**
-    * Construct a new resource bundle whose content is based on the child
-    * and parent content.
+    * Construct a new resource bundle whose content is based on the child and parent content.
     *
     * @param parent the parent eventually null
-    * @param child the child
+    * @param child  the child
     * @throws IllegalArgumentException if the child is null or its locale is null
     */
    public ParentChildResourceBundle(ResourceBundle parent, ResourceBundle child) throws IllegalArgumentException
@@ -73,7 +71,7 @@
       // Set the parent content
       if (parent != null)
       {
-         for (Enumeration e = parent.getKeys();e.hasMoreElements();)
+         for (Enumeration e = parent.getKeys(); e.hasMoreElements();)
          {
             String key = (String)e.nextElement();
             Object value = parent.getObject(key);
@@ -82,7 +80,7 @@
       }
 
       // Set the child content
-      for (Enumeration e = child.getKeys();e.hasMoreElements();)
+      for (Enumeration e = child.getKeys(); e.hasMoreElements();)
       {
          String key = (String)e.nextElement();
          Object value = child.getObject(key);

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/SetMap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/SetMap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/SetMap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
+import java.io.Serializable;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Comparator;
-import java.util.TreeSet;
 import java.util.SortedSet;
-import java.io.Serializable;
+import java.util.TreeSet;
 
 /**
- * A map of set. This object does not handle synchronization and use HashMap and HashSet
- * as underlying data structures;
+ * A map of set. This object does not handle synchronization and use HashMap and HashSet as underlying data structures;
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -92,9 +92,7 @@
       init(null, comparator);
    }
 
-   /**
-    * Add an object in the set keyed under the specified key.
-    */
+   /** Add an object in the set keyed under the specified key. */
    public void put(Object key, Object o)
    {
       Set set = (Set)map.get(key);
@@ -106,25 +104,19 @@
       set.add(o);
    }
 
-   /**
-    * Return the set of keys.
-    */
+   /** Return the set of keys. */
    public Set keySet()
    {
       return map.keySet();
    }
 
-   /**
-    * Remove the entire set of objects specified by the key.
-    */
+   /** Remove the entire set of objects specified by the key. */
    public void remove(Object key)
    {
       map.remove(key);
    }
 
-   /**
-    * Remove an object in the set keyed under the specified key.
-    */
+   /** Remove an object in the set keyed under the specified key. */
    public void remove(Object key, Object o)
    {
       Set set = (Set)map.get(key);
@@ -138,9 +130,7 @@
       }
    }
 
-   /**
-    * Return true if the specified set contains the object o.
-    */
+   /** Return true if the specified set contains the object o. */
    public boolean contains(Object key, Object o)
    {
       Set set = (Set)map.get(key);
@@ -154,17 +144,13 @@
       }
    }
 
-   /**
-    * Return the set specified by the key.
-    */
+   /** Return the set specified by the key. */
    public Set get(Object key)
    {
       return (Set)map.get(key);
    }
 
-   /**
-    * Return an iterator over the values in the set specified by the key.
-    */
+   /** Return an iterator over the values in the set specified by the key. */
    public Iterator iterator(final Object key)
    {
       Set set = (Set)map.get(key);
@@ -181,10 +167,12 @@
             {
                return iterator.hasNext();
             }
+
             public Object next()
             {
                return iterator.next();
             }
+
             public void remove()
             {
                iterator.remove();

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ThrowableBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ThrowableBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/ThrowableBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 
 /**
  * A bean to manipulate throwable.
@@ -166,9 +167,7 @@
          this.lineNumber = lineNumber;
       }
 
-      /**
-       * Create a <code>java.lang.StackTraceElement</code> from this object.
-       */
+      /** Create a <code>java.lang.StackTraceElement</code> from this object. */
       public StackTraceElement toStackTraceElement()
       {
          if (declaringClass == null)
@@ -264,9 +263,7 @@
       return throwable;
    }
 
-   /**
-    * Clone a throwable using serialization.
-    */
+   /** Clone a throwable using serialization. */
    private Throwable clone(Throwable t)
    {
       try

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/UUIDGenerator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/UUIDGenerator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/UUIDGenerator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import java.net.InetAddress;
@@ -26,10 +27,9 @@
 
 /**
  * Adapted from ejb plugin key generated.
- * 
- * The implementation of UUID key generator
- * based on the algorithm from Floyd Marinescu's EJB Design Patterns.
- * 
+ * <p/>
+ * The implementation of UUID key generator based on the algorithm from Floyd Marinescu's EJB Design Patterns.
+ *
  * @author <a href="mailto:alex.loubyansky at jboss.org">Alex Loubyansky</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -57,14 +57,14 @@
       try
       {
          // Cache the middle part for UUID
-         StringBuffer buffer = new StringBuffer( 16 );
+         StringBuffer buffer = new StringBuffer(16);
 
          // Construct host part of the uuid (8 hex digits)
          byte[] addr = InetAddress.getLocalHost().getAddress();
-         buffer.append( toHex( toInt(addr), 8 ) );
+         buffer.append(toHex(toInt(addr), 8));
 
          // Append the hash code for this object (8 hex digits)
-         buffer.append( toHex( System.identityHashCode(this), 8 ) );
+         buffer.append(toHex(System.identityHashCode(this), 8));
 
          // Set up midValue
          midValue = buffer.toString();
@@ -87,26 +87,24 @@
       buffer.append(toHex((int)(System.currentTimeMillis() & 0xFFFFFFFF), 8));
 
       // Append cached midValue
-      buffer.append( midValue );
+      buffer.append(midValue);
 
       // Append the next random int
-      buffer.append( toHex( seeder.nextInt(), 8 ) );
+      buffer.append(toHex(seeder.nextInt(), 8));
 
       // Return the result
       return buffer.toString();
    }
 
    // Private ------------------------------------------------------
-   
-   /**
-    * Converts int value to string hex representation
-    */
+
+   /** Converts int value to string hex representation */
    private String toHex(int value, int length)
    {
       StringBuffer buffer = new StringBuffer(length);
       int shift = (length - 1) << 2;
       int i = -1;
-      while(++i < length)
+      while (++i < length)
       {
          buffer.append(hexDigits[(value >> shift) & 0x0000000F]);
          value <<= 4;
@@ -114,17 +112,15 @@
       return buffer.toString();
    }
 
-   /**
-    * Constructs int value from byte array
-    */
-   private static int toInt( byte[] bytes )
+   /** Constructs int value from byte array */
+   private static int toInt(byte[] bytes)
    {
       int value = 0;
       int i = -1;
       while (++i < bytes.length)
       {
          value <<= 8;
-         int b = bytes[ i ] & 0xff;
+         int b = bytes[i] & 0xff;
          value |= b;
       }
       return value;

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Version.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Version.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Version.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.util;
 
 /**
- * Version class conforming to JBoss Product Version Conventions post 2006-03-01.
- * See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossProductVersioning.
+ * Version class conforming to JBoss Product Version Conventions post 2006-03-01. See
+ * http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossProductVersioning.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -87,41 +88,31 @@
       return codeName;
    }
 
-   /**
-    * Return the name;
-    */
+   /** Return the name; */
    public String getName()
    {
       return name;
    }
 
-   /**
-    * Return the major.
-    */
+   /** Return the major. */
    public int getMajor()
    {
       return major;
    }
 
-   /**
-    * Return the minor.
-    */
+   /** Return the minor. */
    public int getMinor()
    {
       return minor;
    }
 
-   /**
-    * Return the pacht.
-    */
+   /** Return the pacht. */
    public int getPatch()
    {
       return patch;
    }
 
-   /**
-    * Return the intermediate major.
-    */
+   /** Return the intermediate major. */
    public Qualifier getQualifier()
    {
       return qualifier;
@@ -142,9 +133,7 @@
       return buffer.toString();
    }
 
-   /**
-    * Type safe enum for intermediate major.
-    */
+   /** Type safe enum for intermediate major. */
    public static class Qualifier
    {
 
@@ -167,18 +156,22 @@
             this.suffixable = suffixable;
             this.description = description;
          }
+
          public String getName()
          {
             return name;
          }
+
          public boolean isSuffixable()
          {
             return suffixable;
          }
+
          public String getDescription()
          {
             return description;
          }
+
          public String toString()
          {
             return name;

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/XML.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/XML.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/XML.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.util;
 
 import org.w3c.dom.Document;
@@ -44,9 +45,9 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.Iterator;
 
 /**
  * Utilities for dealing with XML.
@@ -103,16 +104,12 @@
    /** . */
    public static final boolean DEFAULT_VALIDATION = false;
 
-   /**
-    * prevent instantiation
-    */
+   /** prevent instantiation */
    private XML()
    {
    }
 
-   /**
-    * Return the builder factory.
-    */
+   /** Return the builder factory. */
    public static DocumentBuilderFactory getDocumentBuilderFactory()
    {
       return buildFactory;
@@ -141,10 +138,7 @@
    }
 
    /**
-    * Serialize the document with the default format :
-    * - No XML declaration
-    * - Indented
-    * - Encoding is UTF-8
+    * Serialize the document with the default format : - No XML declaration - Indented - Encoding is UTF-8
     *
     * @see #toString(Document,Properties)
     */
@@ -153,17 +147,13 @@
       return toString(doc, DEFAULT_FORMAT);
    }
 
-   /**
-    * @see #toString(Document)
-    */
+   /** @see #toString(Document) */
    public static String toString(Element element) throws ParserConfigurationException, TransformerException
    {
       return toString(element, DEFAULT_FORMAT);
    }
 
-   /**
-    * Converts an element to a String representation.
-    */
+   /** Converts an element to a String representation. */
    private static String toString(Element element, Properties properties) throws ParserConfigurationException, TransformerException
    {
       Document doc = buildFactory.newDocumentBuilder().newDocument();
@@ -172,9 +162,7 @@
       return toString(doc, properties);
    }
 
-   /**
-    * Converts an document to a String representation.
-    */
+   /** Converts an document to a String representation. */
    private static String toString(Document doc, Properties format) throws TransformerException
    {
       Transformer transformer = transformerFactory.newTransformer();
@@ -186,9 +174,7 @@
       return writer.toString();
    }
 
-   /**
-    * Parse a string into a document.
-    */
+   /** Parse a string into a document. */
    public static Document toDocument(String text) throws ParserConfigurationException, SAXException, IOException
    {
       DocumentBuilder builder = buildFactory.newDocumentBuilder();
@@ -199,9 +185,7 @@
       return doc;
    }
 
-   /**
-    * Parse a string into an element.
-    */
+   /** Parse a string into an element. */
    public static Element toElement(String text) throws ParserConfigurationException, SAXException, IOException
    {
       Document doc = toDocument(text);
@@ -214,7 +198,7 @@
     * @param element
     * @return
     * @throws IllegalArgumentException
-    * @see #asString(org.w3c.dom.Element, boolean)
+    * @see #asString(org.w3c.dom.Element,boolean)
     */
    public static String asString(Element element) throws IllegalArgumentException
    {
@@ -243,14 +227,14 @@
          Node child = children.item(i);
          switch (child.getNodeType())
          {
-         case Node.CDATA_SECTION_NODE:
-         case Node.TEXT_NODE:
-            buffer.append(((Text)child).getData());
-            break;
-         case Node.ELEMENT_NODE:
-            throw new IllegalArgumentException("Mixed content now allowed");
-         default:
-            break;
+            case Node.CDATA_SECTION_NODE:
+            case Node.TEXT_NODE:
+               buffer.append(((Text)child).getData());
+               break;
+            case Node.ELEMENT_NODE:
+               throw new IllegalArgumentException("Mixed content now allowed");
+            default:
+               break;
          }
       }
       String result = buffer.toString();
@@ -319,19 +303,19 @@
       List list = getChildren(element, name);
       switch (list.size())
       {
-      case 0:
-         if (strict)
-         {
-            throw new NoSuchElementException("Missing child " + name + " of element " + element.getNodeName());
-         }
-         else
-         {
-            return null;
-         }
-      case 1:
-         return (Element)list.get(0);
-      default:
-         throw new TooManyElementException("Too many children for element " + element.getNodeName());
+         case 0:
+            if (strict)
+            {
+               throw new NoSuchElementException("Missing child " + name + " of element " + element.getNodeName());
+            }
+            else
+            {
+               return null;
+            }
+         case 1:
+            return (Element)list.get(0);
+         default:
+            throw new TooManyElementException("Too many children for element " + element.getNodeName());
       }
    }
 

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/BooleanValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/BooleanValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/BooleanValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 
@@ -31,7 +32,7 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -1478457007976203260L;
-   
+
    /** The Boolean array. */
    private Boolean[] values;
 
@@ -71,7 +72,7 @@
          throw new IllegalArgumentException();
       }
       values = new Boolean[_values.length];
-      for (int i = 0;i < _values.length;i++)
+      for (int i = 0; i < _values.length; i++)
       {
          values[i] = Boolean.valueOf(_values[i]);
       }
@@ -84,7 +85,7 @@
          throw new IllegalArgumentException();
       }
       this.values = new Boolean[values.length];
-      for (int i = 0;i < values.length;i++)
+      for (int i = 0; i < values.length; i++)
       {
          String value = values[i];
          if (value == null)

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ConversionException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ConversionException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ConversionException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 /**
@@ -29,17 +30,21 @@
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 4647584036804084315L;
+
    public ConversionException()
    {
    }
+
    public ConversionException(String message)
    {
       super(message);
    }
+
    public ConversionException(String message, Throwable cause)
    {
       super(message, cause);
    }
+
    public ConversionException(Throwable cause)
    {
       super(cause);

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Converter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Converter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Converter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 
@@ -38,7 +39,7 @@
    /**
     * String to object conversion.
     *
-    * @throws NullConversionException if the value nullity prevent the conversion
+    * @throws NullConversionException   if the value nullity prevent the conversion
     * @throws FormatConversionException if the value cannot be converted
     */
    Object toObject(String value) throws NullConversionException, FormatConversionException;
@@ -46,7 +47,7 @@
    /**
     * Convert the object to the stored value.
     *
-    * @throws NullConversionException if the value nullity prevent the conversion
+    * @throws NullConversionException   if the value nullity prevent the conversion
     * @throws FormatConversionException if the value cannot be converted
     */
    String toString(Object value) throws NullConversionException, FormatConversionException;

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/FloatValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/FloatValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/FloatValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 /**
@@ -30,7 +31,7 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -3069055353952983120L;
-   
+
    /** The Float array. */
    private Float[] values;
 
@@ -70,7 +71,7 @@
          throw new IllegalArgumentException();
       }
       values = new Float[_values.length];
-      for (int i = 0;i < _values.length;i++)
+      for (int i = 0; i < _values.length; i++)
       {
          values[i] = new Float(_values[i]);
       }
@@ -85,7 +86,7 @@
       try
       {
          this.values = new Float[values.length];
-         for (int i = 0;i < values.length;i++)
+         for (int i = 0; i < values.length; i++)
          {
             String value = values[i];
             if (value != null)

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Helper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Helper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Helper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 
@@ -40,6 +41,7 @@
       {
          return Float.class.equals(clazz);
       }
+
       public Object toObject(String value) throws NullConversionException, FormatConversionException
       {
          if (value == null)
@@ -55,6 +57,7 @@
             throw new FormatConversionException();
          }
       }
+
       public String toString(Object value) throws NullConversionException, FormatConversionException
       {
          if (value == null)
@@ -75,6 +78,7 @@
       {
          return Integer.class.equals(clazz);
       }
+
       public Object toObject(String value) throws NullConversionException, FormatConversionException
       {
          if (value == null)
@@ -90,6 +94,7 @@
             throw new FormatConversionException();
          }
       }
+
       public String toString(Object value) throws NullConversionException, FormatConversionException
       {
          if (value == null)
@@ -110,6 +115,7 @@
       {
          return Boolean.class.equals(clazz);
       }
+
       public Object toObject(String value) throws NullConversionException, FormatConversionException
       {
          if (value == null)
@@ -118,6 +124,7 @@
          }
          return Boolean.valueOf(Helper.toBoolean(value));
       }
+
       public String toString(Object value) throws NullConversionException, FormatConversionException
       {
          if (value == null)
@@ -194,7 +201,7 @@
          throw new IllegalArgumentException();
       }
       String[] strings = new String[values.length];
-      for (int i = 0;i < strings.length;i++)
+      for (int i = 0; i < strings.length; i++)
       {
          strings[i] = Integer.toString(values[i]);
       }
@@ -208,7 +215,7 @@
          throw new IllegalArgumentException();
       }
       String[] strings = new String[values.length];
-      for (int i = 0;i < strings.length;i++)
+      for (int i = 0; i < strings.length; i++)
       {
          strings[i] = Boolean.toString(values[i]);
       }
@@ -226,7 +233,7 @@
          throw new IllegalArgumentException();
       }
       String[] strings = new String[values.length];
-      for (int i = 0;i < strings.length;i++)
+      for (int i = 0; i < strings.length; i++)
       {
          Object value = values[i];
          if (value != null)

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/IntegerValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/IntegerValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/IntegerValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 
@@ -31,7 +32,7 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -3396982952223096067L;
-   
+
    /** The Integer array. */
    private Integer[] values;
 
@@ -71,7 +72,7 @@
          throw new IllegalArgumentException();
       }
       values = new Integer[_values.length];
-      for (int i = 0;i < _values.length;i++)
+      for (int i = 0; i < _values.length; i++)
       {
          values[i] = new Integer(_values[i]);
       }
@@ -86,7 +87,7 @@
       try
       {
          this.values = new Integer[values.length];
-         for (int i = 0;i < values.length;i++)
+         for (int i = 0; i < values.length; i++)
          {
             String value = values[i];
             if (value != null)

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/SimpleValueMap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/SimpleValueMap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/SimpleValueMap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.value;
 
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.io.Serializable;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/StringValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/StringValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/StringValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 
@@ -31,7 +32,7 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = 4280801691629359883L;
-   
+
    /** The String array. */
    private String[] values;
 

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Value.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Value.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/Value.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,65 +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.common.value;
 
 
 import java.io.Serializable;
+import java.util.AbstractList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.ListIterator;
-import java.util.AbstractList;
 import java.util.RandomAccess;
 
 /**
- * A read only interface used to retrieve data. It represents both for
- * mono value and multi values. It must implement equals and hashCode.
+ * A read only interface used to retrieve data. It represents both for mono value and multi values. It must implement
+ * equals and hashCode.
  * <p/>
  * The semantics :
  * <p/>
- * <table border="1">
- * <tr>
- * <th>storage</th><th>mono</th><th>multi</th>
- * </tr>
- * <tr>
- * <td>xxx</td><td>xxx</td><td>[xxx]</td>
- * </tr>
- * <tr>
- * <td>null</td><td>null</td><td>[null]</td>
- * </tr>
- * <tr>
- * <td colspan="3"></td>
- * </tr>
- * <tr>
- * <td>[]</td><td>null</td><td>[]</td>
- * </tr>
- * <tr>
- * <td>[null,..]</td><td>null</td><td>[null,..]</td>
- * </tr>
- * <tr>
- * <td>["1",..]</td><td>"1"</td><td>["1",..]</td>
- * </tr>
- * </table>
+ * <table border="1"> <tr> <th>storage</th><th>mono</th><th>multi</th> </tr> <tr> <td>xxx</td><td>xxx</td><td>[xxx]</td>
+ * </tr> <tr> <td>null</td><td>null</td><td>[null]</td> </tr> <tr> <td colspan="3"></td> </tr> <tr>
+ * <td>[]</td><td>null</td><td>[]</td> </tr> <tr> <td>[null,..]</td><td>null</td><td>[null,..]</td> </tr> <tr>
+ * <td>["1",..]</td><td>"1"</td><td>["1",..]</td> </tr> </table>
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -67,19 +46,13 @@
 public abstract class Value implements Serializable, Cloneable
 {
 
-   /**
-    * The cached hashCode.
-    */
+   /** The cached hashCode. */
    private transient int hashCode = 0;
 
-   /**
-    * The object list representation.
-    */
+   /** The object list representation. */
    private transient List objectList;
 
-   /**
-    * The string list representation.
-    */
+   /** The string list representation. */
    private transient List stringList;
 
    // ******************************
@@ -174,17 +147,13 @@
    // * Mono valued methods *
    // ***********************
 
-   /**
-    * Return true if the value is null.
-    */
+   /** Return true if the value is null. */
    public final boolean isNull()
    {
       return getObjectArray().length == 0 || getObjectArray()[0] == null;
    }
 
-   /**
-    * Return the value as a string or null if the value is null.
-    */
+   /** Return the value as a string or null if the value is null. */
    public final String asString()
    {
       String string = null;
@@ -196,9 +165,7 @@
       return string;
    }
 
-   /**
-    * Return the value.
-    */
+   /** Return the value. */
    public final Object asObject()
    {
       if (isNull())
@@ -212,33 +179,25 @@
    // * Multi valued methods *
    // ************************
 
-   /**
-    * Return true if it contains more than one value.
-    */
+   /** Return true if it contains more than one value. */
    public final boolean isMultiValued()
    {
       return size() > 1;
    }
 
-   /**
-    * Return true if it contains zero value.
-    */
+   /** Return true if it contains zero value. */
    public final boolean isEmpty()
    {
       return size() == 0;
    }
 
-   /**
-    * Return the size.
-    */
+   /** Return the size. */
    public final int size()
    {
       return getObjectArray().length;
    }
 
-   /**
-    * Creates a new array and fill it with the string values.
-    */
+   /** Creates a new array and fill it with the string values. */
    public final String[] asStringArray()
    {
       Object[] objects = getObjectArray();
@@ -254,17 +213,13 @@
       return strings;
    }
 
-   /**
-    * Create a new array and fill it with the values.
-    */
+   /** Create a new array and fill it with the values. */
    public final Object[] asObjectArray()
    {
       return (Object[])getObjectArray().clone();
    }
 
-   /**
-    * Return an immutable list of strings.
-    */
+   /** Return an immutable list of strings. */
    public final List asStringList()
    {
       if (stringList == null)
@@ -274,9 +229,7 @@
       return stringList;
    }
 
-   /**
-    * Return an immutable list of objects.
-    */
+   /** Return an immutable list of objects. */
    public final List asObjectList()
    {
       if (objectList == null)
@@ -287,9 +240,7 @@
       return objectList;
    }
 
-   /**
-    * Return the values as an array of converted object. It must always return a non null array.
-    */
+   /** Return the values as an array of converted object. It must always return a non null array. */
    protected abstract Object[] getObjectArray();
 
    private static class ValueList extends AbstractList implements List, RandomAccess

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ValueMap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ValueMap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/value/ValueMap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.common.value;
 
 import java.util.Set;
@@ -29,9 +30,7 @@
  */
 public interface ValueMap
 {
-   /**
-    * Return the key set of the map.
-    */
+   /** Return the key set of the map. */
    Set getKeys();
 
    /**
@@ -44,14 +43,13 @@
    Value getValue(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 setValue(String key, Value value) throws IllegalArgumentException, UnsupportedOperationException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/Application_XWWWFormURLEncodedFormatTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/Application_XWWWFormURLEncodedFormatTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/Application_XWWWFormURLEncodedFormatTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.common;
 
 import junit.framework.TestCase;
@@ -45,7 +46,7 @@
    public void testInvariant()
    {
       assertEquals(INVARIANT_STRING, format.encode(INVARIANT_STRING));
-      for (int i = 0;i < INVARIANT_STRING.length();i++)
+      for (int i = 0; i < INVARIANT_STRING.length(); i++)
       {
          char c = INVARIANT_STRING.charAt(i);
          String s = format.encode(c);
@@ -60,7 +61,7 @@
 
    public void testASCII() throws Exception
    {
-      for (int i = 0;i < 50000 + 1;i++)
+      for (int i = 0; i < 50000 + 1; i++)
       {
          char c = (char)i;
          String expectedResult = URLEncoder.encode("" + c, "UTF-8");

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/DescriptionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/DescriptionTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/DescriptionTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.common;
 
 import junit.framework.TestCase;
+import org.jboss.portal.common.util.LocalizedString;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
-import org.jboss.portal.common.util.LocalizedString;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/HexTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/HexTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/HexTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.common;
 
 import junit.framework.TestCase;
@@ -39,7 +40,7 @@
 
    public void testBasic()
    {
-      byte[] original = new byte[]{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
+      byte[] original = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
       String hex = Tools.toHexString(original);
       assertEquals("000102030405060708090a0b0c0d0e0f1011121314", hex);
       byte[] copy = Tools.fromHexString(hex);

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ImplodeTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ImplodeTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ImplodeTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.common;
 
 import junit.framework.TestCase;
 import org.jboss.portal.common.ant.Implode;
 
 import java.io.File;
-import java.net.URL;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/InvocationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/InvocationTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/InvocationTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
+import junit.framework.TestCase;
+import org.jboss.portal.common.invocation.Interceptor;
 import org.jboss.portal.common.invocation.Invocation;
 import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.Interceptor;
-import junit.framework.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -73,26 +74,26 @@
          }
       };
       inv.invoke(new Interceptor[]
-      {
-         new Interceptor()
          {
-            public void invoke(Invocation invocation) throws Exception, InvocationException
+            new Interceptor()
             {
-               tmp.append("1");
-               invocation.invokeNext();
-               tmp.append("5");
-            }
-         } ,
-         new Interceptor()
-         {
-            public void invoke(Invocation invocation) throws Exception, InvocationException
+               public void invoke(Invocation invocation) throws Exception, InvocationException
+               {
+                  tmp.append("1");
+                  invocation.invokeNext();
+                  tmp.append("5");
+               }
+            },
+            new Interceptor()
             {
-               tmp.append("2");
-               invocation.invokeNext();
-               tmp.append("4");
+               public void invoke(Invocation invocation) throws Exception, InvocationException
+               {
+                  tmp.append("2");
+                  invocation.invokeNext();
+                  tmp.append("4");
+               }
             }
-         }
-      });
+         });
       assertEquals("12345", tmp.toString());
    }
 
@@ -109,25 +110,25 @@
       try
       {
          inv.invoke(new Interceptor[]
-         {
-            new Interceptor()
             {
-               public void invoke(Invocation invocation) throws Exception, InvocationException
+               new Interceptor()
                {
-                  tmp.append("1");
-                  invocation.invokeNext();
-                  tmp.append("5");
-               }
-            } ,
-            new Interceptor()
-            {
-               public void invoke(Invocation invocation) throws Exception, InvocationException
+                  public void invoke(Invocation invocation) throws Exception, InvocationException
+                  {
+                     tmp.append("1");
+                     invocation.invokeNext();
+                     tmp.append("5");
+                  }
+               },
+               new Interceptor()
                {
-                  tmp.append("2");
-                  throw new InvocationException();
+                  public void invoke(Invocation invocation) throws Exception, InvocationException
+                  {
+                     tmp.append("2");
+                     throw new InvocationException();
+                  }
                }
-            }
-         });
+            });
          fail("Should not be here");
       }
       catch (InvocationException expected)

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JarTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JarTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JarTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
 import junit.framework.TestCase;
+import org.jboss.portal.common.util.Jar;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.Iterator;
-import java.util.Arrays;
-import java.util.jar.JarOutputStream;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
+import java.util.jar.JarOutputStream;
 
-import org.jboss.portal.common.util.Jar;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -59,10 +59,10 @@
       assertEquals(Arrays.asList(new String[]{}), info3.getAtoms());
 
       Jar.EntryInfo info4 = new Jar.EntryInfo(new JarEntry("a/b"));
-      assertEquals(Arrays.asList(new String[]{"a","b"}), info4.getAtoms());
+      assertEquals(Arrays.asList(new String[]{"a", "b"}), info4.getAtoms());
 
       Jar.EntryInfo info5 = new Jar.EntryInfo(new JarEntry("a/b/"));
-      assertEquals(Arrays.asList(new String[]{"a","b"}), info5.getAtoms());
+      assertEquals(Arrays.asList(new String[]{"a", "b"}), info5.getAtoms());
 
       Jar.EntryInfo info6 = new Jar.EntryInfo(new JarEntry("/a"));
       assertEquals(Arrays.asList(new String[]{"a"}), info6.getAtoms());
@@ -71,10 +71,10 @@
       assertEquals(Arrays.asList(new String[]{"a"}), info7.getAtoms());
 
       Jar.EntryInfo info8 = new Jar.EntryInfo(new JarEntry("/a/b"));
-      assertEquals(Arrays.asList(new String[]{"a","b"}), info8.getAtoms());
+      assertEquals(Arrays.asList(new String[]{"a", "b"}), info8.getAtoms());
 
       Jar.EntryInfo info9 = new Jar.EntryInfo(new JarEntry("/a/b/"));
-      assertEquals(Arrays.asList(new String[]{"a","b"}), info9.getAtoms());
+      assertEquals(Arrays.asList(new String[]{"a", "b"}), info9.getAtoms());
    }
 
    public void testEntryComparator() throws IOException

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JavaBeanModelMBeanBuilderTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JavaBeanModelMBeanBuilderTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/JavaBeanModelMBeanBuilderTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.common;
 
 import junit.framework.TestCase;
 import org.jboss.portal.common.mx.JavaBeanModelMBeanBuilder;
 
+import javax.management.Attribute;
 import javax.management.AttributeNotFoundException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
-import javax.management.Attribute;
 import javax.management.modelmbean.ModelMBeanInfo;
 import javax.management.modelmbean.RequiredModelMBean;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Arrays;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -318,11 +319,13 @@
    {
       public final String type;
       public final String name;
+
       public TestAttribute(MBeanAttributeInfo info)
       {
          this.type = info.getType();
          this.name = info.getName();
       }
+
       public TestAttribute(String type, String name)
       {
          if (type == null)
@@ -336,15 +339,18 @@
          this.type = type;
          this.name = name;
       }
+
       public int hashCode()
       {
          return type.hashCode() * 43 + name.hashCode();
       }
+
       public boolean equals(Object obj)
       {
          TestAttribute that = (TestAttribute)obj;
          return type.equals(that.type) && name.equals(that.name);
       }
+
       public String toString()
       {
          return "Attribute[" + type + "," + name + "]";
@@ -356,6 +362,7 @@
       public final String returnType;
       public final String name;
       public final String[] argTypes;
+
       public TestOperation(MBeanOperationInfo info)
       {
          returnType = info.getReturnType();
@@ -366,6 +373,7 @@
             argTypes[i] = info.getSignature()[i].getType();
          }
       }
+
       public TestOperation(String returnType, String name, String[] argTypes)
       {
          if (returnType == null)
@@ -391,6 +399,7 @@
          this.name = name;
          this.argTypes = argTypes;
       }
+
       public int hashCode()
       {
          int code = returnType.hashCode() * 43 + name.hashCode();
@@ -401,11 +410,13 @@
          }
          return code;
       }
+
       public boolean equals(Object obj)
       {
          TestOperation that = (TestOperation)obj;
          return returnType.equals(that.returnType) && name.equals(that.name) && Arrays.equals(argTypes, that.argTypes);
       }
+
       public String toString()
       {
          StringBuffer tmp = new StringBuffer("Operation[").append(returnType).append(",").append(name);

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

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParameterMapTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParameterMapTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParameterMapTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
 import junit.framework.TestCase;
 import org.jboss.portal.common.util.ParameterMap;
 
 import java.util.HashMap;
-import java.util.Set;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -39,6 +40,7 @@
    public static class TestParameterMap extends ParameterMap
    {
       private final Map delegate = new HashMap();
+
       protected Map getDelegate()
       {
          return delegate;

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParentChildResourceBundleTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParentChildResourceBundleTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ParentChildResourceBundleTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,26 +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.common;
 
+import junit.framework.TestCase;
+import org.jboss.portal.common.util.ParentChildResourceBundle;
+
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -29,10 +33,6 @@
 import java.util.Set;
 import java.util.Vector;
 
-import junit.framework.TestCase;
-
-import org.jboss.portal.common.util.ParentChildResourceBundle;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -60,6 +60,7 @@
             }
             return null;
          }
+
          public Enumeration getKeys()
          {
             Vector keys = new Vector();
@@ -67,6 +68,7 @@
             keys.add("key-b");
             return keys.elements();
          }
+
          public Locale getLocale()
          {
             return Locale.CHINA;
@@ -86,6 +88,7 @@
             }
             return null;
          }
+
          public Enumeration getKeys()
          {
             Vector keys = new Vector();
@@ -93,6 +96,7 @@
             keys.add("key-c");
             return keys.elements();
          }
+
          public Locale getLocale()
          {
             return Locale.GERMAN;
@@ -103,8 +107,8 @@
       assertEquals("child-a", bundle.getString("key-a"));
       assertEquals("parent-b", bundle.getString("key-b"));
       assertEquals("child-c", bundle.getString("key-c"));
-      Set keys = new HashSet(Arrays.asList(new Object[]{"key-a","key-b","key-c"}));
-      for (Enumeration e = bundle.getKeys();e.hasMoreElements();)
+      Set keys = new HashSet(Arrays.asList(new Object[]{"key-a", "key-b", "key-c"}));
+      for (Enumeration e = bundle.getKeys(); e.hasMoreElements();)
       {
          assertTrue(keys.remove(e.nextElement()));
       }

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PathTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PathTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PathTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.common;
 
 import junit.framework.TestCase;
@@ -33,7 +34,7 @@
 
    public void testSimpleDown()
    {
-      String[] paths = {"abc","abc/","abc/."};
+      String[] paths = {"abc", "abc/", "abc/."};
       for (int i = 0; i < paths.length; i++)
       {
          String path = paths[i];
@@ -50,7 +51,7 @@
 
    public void testSimpleNone()
    {
-      String[] paths = {"",".","./","./."};
+      String[] paths = {"", ".", "./", "./."};
       for (int i = 0; i < paths.length; i++)
       {
          String path = paths[i];
@@ -63,7 +64,7 @@
 
    public void testSimpleUp()
    {
-      String[] paths = {"..","../","../."};
+      String[] paths = {"..", "../", "../."};
       for (int i = 0; i < paths.length; i++)
       {
          String path = paths[i];

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PreferencesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PreferencesTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/PreferencesTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
 import junit.framework.TestCase;
-import org.jboss.portal.common.prefs.Preferences;
-import org.jboss.portal.common.prefs.MapPreferences;
 import org.jboss.portal.common.prefs.CombinedPreferencesResolver;
+import org.jboss.portal.common.prefs.MapPreferences;
+import org.jboss.portal.common.prefs.Preferences;
 import org.jboss.portal.common.prefs.PreferencesResolver;
 import org.jboss.portal.common.value.StringValue;
 
@@ -43,12 +44,8 @@
    }
 
    /**
-    * a - value rw defined by sys1
-    * b - value rw defined by sys2
-    * c - value rw defined by sys1 and sys2
-    * d - value ro defined by sys1
-    * e - value ro defined by sys2
-    * f - value ro defined by sys1 and sys2
+    * a - value rw defined by sys1 b - value rw defined by sys2 c - value rw defined by sys1 and sys2 d - value ro
+    * defined by sys1 e - value ro defined by sys2 f - value ro defined by sys1 and sys2
     */
    public void testSimpleResolver()
    {
@@ -70,7 +67,7 @@
       sys2.setReadOnly("f", true);
 
       //
-      PreferencesResolver resolver = new CombinedPreferencesResolver(new Preferences[]{sys1,sys2});
+      PreferencesResolver resolver = new CombinedPreferencesResolver(new Preferences[]{sys1, sys2});
       assertEquals(new StringValue("a-sys1"), resolver.getValue("a"));
       assertEquals(new StringValue("b-sys2"), resolver.getValue("b"));
       assertEquals(new StringValue("c-sys1"), resolver.getValue("c"));
@@ -88,10 +85,8 @@
    }
 
    /**
-    * a - no value ro defined by sys1
-    * b - no value ro defined by sys2
-    * c - no value ro defined by sys2 and value ro defined by sys1
-    * c - no value ro defined by sys2 and value rw defined by sys1
+    * a - no value ro defined by sys1 b - no value ro defined by sys2 c - no value ro defined by sys2 and value ro
+    * defined by sys1 c - no value ro defined by sys2 and value rw defined by sys1
     */
    public void testSimpleResolver2()
    {
@@ -108,7 +103,7 @@
       sys2.setReadOnly("d", true);
 
       //
-      PreferencesResolver resolver = new CombinedPreferencesResolver(new Preferences[]{sys1,sys2});
+      PreferencesResolver resolver = new CombinedPreferencesResolver(new Preferences[]{sys1, sys2});
       assertEquals(null, resolver.getValue("a"));
       assertEquals(null, resolver.getValue("b"));
       assertEquals(null, resolver.getValue("c"));

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/TemporaryHashTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/TemporaryHashTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/TemporaryHashTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
 import junit.framework.TestCase;
+import org.jboss.portal.common.util.Tools;
 
 import java.util.Calendar;
 
-import org.jboss.portal.common.util.Tools;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ThrowableBeanTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ThrowableBeanTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ThrowableBeanTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
+import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
 import org.jboss.portal.common.util.ThrowableBean;
 
 /**

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common;
 
 import junit.framework.TestCase;
+import org.jboss.portal.common.net.URLNavigator;
+import org.jboss.portal.common.net.URLVisitor;
 
 import java.io.File;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
-import org.jboss.portal.common.net.URLVisitor;
-import org.jboss.portal.common.net.URLNavigator;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -155,7 +155,7 @@
       URL dirURL2 = f2.toURL();
       doTestJar(expectedAtoms2, expectedURLs2, dirURL2);
 
-       //
+      //
       File f3 = new File(resourcesDir, "test/test-jar/a1/b1/c1/d1.txt");
       assertTrue(f3.exists());
       assertFalse(f3.isDirectory());
@@ -174,11 +174,13 @@
             atoms.add("<" + name + ">");
             urls.add(url);
          }
+
          public void endDir(URL url, String name)
          {
             atoms.add("</" + name + ">");
             urls.add(url);
          }
+
          public void file(URL url, String name)
          {
             atoms.add(name);
@@ -186,12 +188,12 @@
          }
       });
 
-      if (urls.size() !=  expectedURLs.size())
+      if (urls.size() != expectedURLs.size())
       {
          fail("URLs size does not match " + urls.size() + "!=" + expectedURLs.size());
       }
 
-      for (int i = 0;i < urls.size();i++)
+      for (int i = 0; i < urls.size(); i++)
       {
          URL entryURL = (URL)urls.get(i);
          String suffix = (String)expectedURLs.get(i);

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

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValueTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValueTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValueTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.common;
 
 import junit.framework.TestCase;
-
-import org.jboss.portal.common.value.Value;
 import org.jboss.portal.common.value.IntegerValue;
 import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.value.Value;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -122,9 +122,9 @@
 
    public void testIntegerValueIntegerArray() throws Exception
    {
-      _testIntegerValueIntegerArray(new IntegerValue(new int[]{1,2}));
+      _testIntegerValueIntegerArray(new IntegerValue(new int[]{1, 2}));
       _testIntegerValueIntegerArray(new IntegerValue(new Integer[]{new Integer(1), new Integer(2)}));
-      _testIntegerValueIntegerArray(new IntegerValue(new String[]{"1","2"}));
+      _testIntegerValueIntegerArray(new IntegerValue(new String[]{"1", "2"}));
    }
 
    private void _testIntegerValueIntegerArray(Value value) throws Exception
@@ -184,7 +184,7 @@
       assertEquals(a, c);
 
       //
-      StringValue d = new StringValue(new String[]{"abc","def"});
+      StringValue d = new StringValue(new String[]{"abc", "def"});
       Object e = d.clone();
       assertTrue(e instanceof StringValue);
       StringValue f = (StringValue)e;

Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValveTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValveTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/test/common/ValveTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.common;
 
-import java.io.PrintStream;
-
+import EDU.oswego.cs.dl.util.concurrent.CyclicBarrier;
 import junit.framework.TestCase;
-
 import org.jboss.portal.common.concurrent.Valve;
 
-import EDU.oswego.cs.dl.util.concurrent.CyclicBarrier;
+import java.io.PrintStream;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -100,7 +99,6 @@
       {
       }
 
-
       // Closing the valve
       valve.closing();
       assertEquals(Valve.CLOSING, valve.getState());

Modified: branches/JBoss_Portal_Branch_2_4/common/src/resources/test/implode/foo.sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/common/src/resources/test/implode/foo.sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/common/src/resources/test/implode/foo.sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -0,0 +1,23 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+

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

Modified: branches/JBoss_Portal_Branch_2_4/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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">
@@ -298,8 +321,8 @@
          <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
          <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
          <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
-	     <!-- cms optimization integration - this contains a clustered cache enabled version -->
-	     <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
+         <!-- cms optimization integration - this contains a clustered cache enabled version -->
+         <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
 		 <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>		 
       </copy>
       <!-- hibernate configuration for identity -->
@@ -493,9 +516,11 @@
            depends="output-ha">
          <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
          <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
-         <!-- upgrade the jbosscache version -->
-         <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/${portal-ha.deploy.dir}/../lib" overwrite="true"/>
-         <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/${portal-ha.deploy.dir}/../lib" overwrite="true"/>
+      <!-- upgrade the jbosscache version -->
+      <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/${portal-ha.deploy.dir}/../lib"
+            overwrite="true"/>
+         <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/${portal-ha.deploy.dir}/../lib"
+               overwrite="true"/>
    </target>
 
    <target name="deploy-management"

Modified: branches/JBoss_Portal_Branch_2_4/core/src/etc/jboss-aop/base-aop.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/etc/jboss-aop/base-aop.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/etc/jboss-aop/base-aop.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreController.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreController.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/CoreController.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,36 +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;
 
+import org.jboss.portal.common.invocation.InterceptorStack;
 import org.jboss.portal.common.system.AbstractJBossService;
-import org.jboss.portal.common.invocation.InterceptorStack;
+import org.jboss.portal.core.command.CommandException;
+import org.jboss.portal.core.command.ControllerCommand;
+import org.jboss.portal.core.command.ErrorResultException;
+import org.jboss.portal.core.command.ExecutionContext;
+import org.jboss.portal.core.command.ObjectNotFoundException;
 import org.jboss.portal.core.command.mapper.CommandFactory;
-import org.jboss.portal.core.command.*;
 import org.jboss.portal.core.command.mapper.URLFactory;
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.server.RequestController;
+import org.jboss.portal.server.ServerException;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.ServerException;
 import org.jboss.portal.server.ServerURL;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.theme.page.PageService;
@@ -39,7 +44,6 @@
 import java.io.IOException;
 
 /**
- *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -123,7 +127,7 @@
       try
       {
          cmd = commandFactory.doMapping(invocation, invocation.getRequest().getContext().getPortalContextPath(), invocation.getRequest().getContext().getPortalRequestPath());
-         ec.execute(cmd );
+         ec.execute(cmd);
       }
       catch (org.jboss.portal.core.command.SecurityException e)
       {
@@ -135,7 +139,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);
          }
       }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/JBossPortalNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/JBossPortalNode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/JBossPortalNode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.api;
 
 import org.jboss.portal.api.node.PortalNode;
@@ -32,13 +33,9 @@
  */
 public interface JBossPortalNode extends PortalNode
 {
-   /**
-    * Return the node ref.
-    */
+   /** Return the node ref. */
    String getRef();
 
-   /**
-    * Fire a pre event on this node.
-    */
+   /** Fire a pre event on this node. */
    PortalNodeEvent fireEvent(PortalNodeEvent event);
 }

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/PortalNodeURLFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/PortalNodeURLFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/api/PortalNodeURLFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api;
 
+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.command.InvokeWindowRenderCommand;
+import org.jboss.portal.core.command.RenderPageCommand;
+import org.jboss.portal.core.command.portlet.CoreInvocationContext;
+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.command.InvokeWindowRenderCommand;
-import org.jboss.portal.core.command.RenderPageCommand;
-import org.jboss.portal.core.command.portlet.CoreInvocationContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/EventBroadcasterInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/EventBroadcasterInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/EventBroadcasterInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
-import java.util.Map;
-
+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.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.common.invocation.InvocationException;
+import org.jboss.portal.common.util.LazyMap;
+import org.jboss.portal.core.api.JBossPortalNode;
+import org.jboss.portal.core.api.Navigation;
 import org.jboss.portal.core.command.CommandInterceptor;
 import org.jboss.portal.core.command.ControllerCommand;
-import org.jboss.portal.core.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.command.InvokeWindowActionCommand;
+import org.jboss.portal.core.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.command.WindowCommand;
-import org.jboss.portal.core.api.JBossPortalNode;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.core.api.Navigation;
 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.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.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.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 CommandInterceptor
 {
 
@@ -83,7 +81,6 @@
          WindowEvent we = (WindowEvent)nextEvent;
 
 
-
          JBossPortalNode nextNode = (JBossPortalNode)we.getNode();
          String nodeRef = nextNode.getRef();
          Mode mode = we.getMode();

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.CommandInterceptor;
 import org.jboss.portal.core.command.ControllerCommand;
 import org.jboss.portal.core.command.SecurityException;
-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$
@@ -69,6 +68,7 @@
    /**
     * @param cmd
     * @throws org.jboss.portal.common.invocation.InvocationException
+    *
     */
    public void invoke(ControllerCommand cmd) throws Exception, InvocationException
    {
@@ -80,11 +80,11 @@
       }
       catch (PortalSecurityException e)
       {
-         if(isTrace)
+         if (isTrace)
          {
             log.error("Security Exception", e);
          }
          throw new SecurityException(e);
-      } 
-   } 
+      }
+   }
 }
\ No newline at end of file

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PortalNodeInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PortalNodeInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/controller/PortalNodeInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.core.aspects.controller;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.core.api.JBossPortalNode;
+import org.jboss.portal.core.api.Navigation;
 import org.jboss.portal.core.command.CommandInterceptor;
 import org.jboss.portal.core.command.ControllerCommand;
+import org.jboss.portal.core.command.RenderPageCommand;
 import org.jboss.portal.core.command.WindowCommand;
-import org.jboss.portal.core.command.RenderPageCommand;
+import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.api.JBossPortalNode;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.core.api.Navigation;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.identity.User;
 import org.jboss.portal.server.ServerInterceptor;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.identity.User;
 
-import java.util.Locale;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.core.aspects.server;
 
+import org.jboss.logging.Logger;
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.core.CoreConstants;
+import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserModule;
 import org.jboss.portal.server.ServerInterceptor;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.NoSuchUserException;
-import org.jboss.logging.Logger;
 
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
-import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
-import java.util.Date;
+import javax.servlet.http.HttpSessionBindingListener;
 import java.io.Serializable;
 import java.security.Principal;
+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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,26 +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.cms;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.cms.CMS;
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
@@ -30,7 +32,6 @@
 import org.jboss.portal.core.command.ControllerCommand;
 import org.jboss.portal.core.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.command.mapper.AbstractCommandFactory;
-import org.jboss.portal.Mode;
 import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.server.ServerInvocation;
 
@@ -44,14 +45,10 @@
 public class CMSObjectCommandFactory extends AbstractCommandFactory
 {
 
-   /**
-    * .
-    */
+   /** . */
    protected CMS CMSService;
 
-   /**
-    * .
-    */
+   /** . */
    protected String targetWindowRef;
 
    public CMS getCMSService()
@@ -93,26 +90,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 +125,7 @@
             }
          }
       }
-      catch(CMSException e)
+      catch (CMSException e)
       {
          log.error("CMS error", e);
       }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.cms;
 
+import org.jboss.portal.core.cms.command.StreamContentCommand;
 import org.jboss.portal.core.command.ControllerCommand;
 import org.jboss.portal.core.command.mapper.URLFactoryDelegate;
-import org.jboss.portal.core.cms.command.StreamContentCommand;
+import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerURL;
 
 /**
@@ -62,7 +63,7 @@
       {
          throw new IllegalArgumentException("No null command accepted");
       }
-      if(cmd instanceof StreamContentCommand)
+      if (cmd instanceof StreamContentCommand)
       {
          StringBuffer buffer = new StringBuffer();
 
@@ -73,7 +74,7 @@
          }
 
          //
-         StreamContentCommand scc = (StreamContentCommand) cmd;
+         StreamContentCommand scc = (StreamContentCommand)cmd;
          buffer.append(scc.getPath());
          AbstractServerURL asu = new AbstractServerURL();
          asu.setPortalRequestPath(buffer.toString());

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.mx.util.MBeanProxy;
@@ -53,7 +54,7 @@
    private String path;
 
    public StreamContentCommand(String path)
-         throws IllegalArgumentException
+      throws IllegalArgumentException
    {
       this.path = path;
    }
@@ -76,7 +77,7 @@
       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 itemExistsCMD = CMSService.getCommandFactory().createItemExistsCommand(path + "/" + serverInvocation.getRequest().getLocale().getLanguage());
@@ -92,11 +93,11 @@
          }
 */
          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);
          }
 
 //         File file = (File) CMSService.execute(getCMD);
@@ -107,21 +108,21 @@
          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)
       {
          // e.printStackTrace();
          try
          {
             resp.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
          }
-         catch(IOException e1)
+         catch (IOException e1)
          {
             e1.printStackTrace();
          }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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 javax.servlet.ServletOutputStream;
@@ -41,21 +42,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());
 
          FileInputStream in = 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);
          }
@@ -63,20 +64,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
-import org.jboss.portal.server.request.URLContext;
+import org.jboss.portal.common.invocation.Interceptor;
+import org.jboss.portal.common.invocation.InterceptorStack;
 import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.InterceptorStack;
-import org.jboss.portal.common.invocation.Interceptor;
 import org.jboss.portal.core.CoreController;
+import org.jboss.portal.server.request.URLContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -42,7 +43,6 @@
 
    /** Depth of the forward chain. */
 //   protected int forwardDepth;
-
    public CommandContext(ControllerCommand command)
    {
       if (command == null)
@@ -105,11 +105,11 @@
       {
          if (e instanceof CommandException)
          {
-            throw (CommandException)e;
+            throw(CommandException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
 /**
- * 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$
@@ -33,7 +34,7 @@
    private final boolean secured;
    private final String action;
    private final boolean idempotent;
-   
+
    public CommandInfo(boolean secured, String action, boolean idempotent)
    {
       this.secured = secured;
@@ -43,8 +44,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()
@@ -52,17 +54,13 @@
       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;
    }
 
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/CommandInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.portal.common.invocation.Invocation;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ControllerCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ControllerCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ControllerCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.logging.Logger;
@@ -38,18 +39,14 @@
    /** . */
    protected static Logger log = Logger.getLogger(ControllerCommand.class);
 
-   /**
-    * The context of the command.
-    */
+   /** The context of the command. */
    protected CommandContext context;
 
    protected ControllerCommand()
    {
    }
 
-   /**
-    * Return the meta data of this command. 
-    */
+   /** Return the meta data of this command. */
    public abstract CommandInfo getInfo();
 
    public CommandContext getContext()
@@ -69,30 +66,24 @@
     * @throws SecurityException
     */
    public void enforceSecurity(PortalAuthorizationManager pam) throws SecurityException, PortalSecurityException
-   { 
+   {
    }
 
-   /**
-    * Setup state before invocation.
-    */
+   /** Setup state before invocation. */
    public void create() throws CommandException
    {
    }
 
-   /**
-    * Destroy state after invocation.
-    */
+   /** Destroy state after invocation. */
    public void destroy()
    {
    }
 
    protected void dispatch() throws Exception, InvocationException
-   {  
+   {
       execute();
    }
 
-   /**
-    * Execute the command.
-    */
+   /** Execute the command. */
    public abstract void execute() throws CommandException;
 }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ErrorResultException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ErrorResultException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ErrorResultException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.core.command;
 
-import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.portlet.result.ErrorResult;
-import org.jboss.portal.core.command.CommandException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.logging.Logger;
@@ -26,9 +27,10 @@
 import org.jboss.portal.WindowState;
 import org.jboss.portal.core.command.portlet.CoreActionContext;
 import org.jboss.portal.core.output.SignOutResult;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.Parameters;
+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.PortletInvocation;
 import org.jboss.portal.portlet.result.ErrorResult;
 import org.jboss.portal.portlet.result.HTTPRedirectionResult;
@@ -38,7 +40,6 @@
 import org.jboss.portal.portlet.result.Result;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.portlet.Parameters;
 
 import java.io.IOException;
 

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

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.core.aspects.controller.PageNavigationInterceptor;
+import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.navigation.NavigationalStateContext;
+import org.jboss.portal.theme.navigation.WindowNavigationalState;
 import org.jboss.portal.theme.strategy.StrategyException;
-import org.jboss.portal.theme.navigation.WindowNavigationalState;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/MarkupCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/MarkupCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/MarkupCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.util.Exceptions;
 import org.jboss.portal.core.command.portlet.CoreInvocationContext;
@@ -30,8 +33,6 @@
 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.Mode;
-import org.jboss.portal.WindowState;
 import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.portlet.info.ModeInfo;
 import org.jboss.portal.portlet.info.WindowStateInfo;
@@ -85,69 +86,43 @@
 public abstract class MarkupCommand extends PortalObjectCommand
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static String WINDOW_ACCESS_DENIED = "core.render.window_access_denied";
 
-   /**
-    * .
-    */
+   /** . */
    private static String WINDOW_UNAVAILABLE = "core.render.window_unavailable";
 
-   /**
-    * .
-    */
+   /** . */
    private static String WINDOW_ERROR = "core.render.window_error";
 
-   /**
-    * .
-    */
+   /** . */
    private static String WINDOW_INTERNAL_ERROR = "core.render.window_internal_error";
 
-   /**
-    * .
-    */
+   /** . */
    private static String WINDOW_NOT_FOUND = "core.render.window_not_found";
 
-   /**
-    * .
-    */
+   /** . */
    private static String HIDE = "hide";
 
-   /**
-    * .
-    */
+   /** . */
    private static String SHOW = "show";
 
-   /**
-    * .
-    */
+   /** . */
    private static final CommandInfo info = new CommandInfo(false, "view", true);
 
-   /**
-    * .
-    */
+   /** . */
    private final String pageRef;
 
-   /**
-    * .
-    */
+   /** . */
    private final MarkupContainer markupContainer;
 
-   /**
-    * .
-    */
+   /** . */
    private Page page;
 
-   /**
-    * .
-    */
+   /** . */
    private PortalLayout layout;
 
-   /**
-    * .
-    */
+   /** . */
    private boolean personalizable;
 
    /**

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectNotFoundException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectNotFoundException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectNotFoundException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
-import org.jboss.portal.core.command.CommandException;
-
 /**
  * @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 ObjectNotFoundException(String ref)
@@ -42,10 +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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectSecurityException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectSecurityException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/ObjectSecurityException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 /**
@@ -31,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 ObjectSecurityException(String message, String ref)
@@ -46,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/PortalObjectCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/PortalObjectCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/PortalObjectCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
 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.PortalSecurityException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -44,7 +45,7 @@
       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 ObjectSecurityException("Not Authorized");
       }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderPageCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderPageCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderPageCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -49,7 +50,8 @@
    }
 
    /**
-    * 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 / 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderRegionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderRegionCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderRegionCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -51,7 +52,8 @@
    }
 
    /**
-    * Call the component / portlet invocation for each portlet window in this region, and assemble the resulting markup fragments into a region result
+    * Call the component / portlet invocation for each portlet window in this region, and assemble the resulting markup
+    * fragments into a region result
     *
     * @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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.core.command.portlet.CoreRenderContext;
-import org.jboss.portal.server.ServerInvocation;
+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.result.Result;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
+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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowContextCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowContextCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/RenderWindowContextCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -49,7 +50,8 @@
    }
 
    /**
-    * Call the component / portlet invocation for the portlet assigned to this window, and create a window result from the resulting markup fragment
+    * Call the component / portlet invocation for the portlet assigned to this window, and create a window result from
+    * the resulting markup fragment
     *
     * @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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/SecurityException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/SecurityException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/SecurityException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
-import org.jboss.portal.core.command.CommandException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/WindowCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/WindowCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/WindowCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command;
 
+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.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.security.PortalSecurityException;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
-import org.jboss.portal.security.PortalSecurityException;
 
 /**
  * A superclass for command that target a specific window.
@@ -130,6 +131,7 @@
     * @param pam
     * @throws SecurityException
     * @throws org.jboss.portal.security.PortalSecurityException
+    *
     */
    public void enforceSecurity(PortalAuthorizationManager pam) throws SecurityException, PortalSecurityException
    {

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/AbstractCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/AbstractCommandFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/AbstractCommandFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.mapper;
 
 import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.core.command.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.core.command.ControllerCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingCommandFactoryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingCommandFactoryService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingCommandFactoryService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.mapper;
 
 import org.jboss.portal.core.command.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)
       {
          if (factories.containsKey(prefix))
          {
@@ -107,7 +108,7 @@
       {
          throw new IllegalArgumentException("no prefix");
       }
-      synchronized(this)
+      synchronized (this)
       {
          if (!factories.containsKey(prefix))
          {
@@ -119,7 +120,7 @@
       }
    }
 
-   public ControllerCommand doMapping(ServerInvocation invocation, String portalContextPath, String portalRequestPath) 
+   public ControllerCommand doMapping(ServerInvocation invocation, String portalContextPath, String portalRequestPath)
    {
       //
       if (portalRequestPath.length() == 0)

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.mapper;
 
+import org.jboss.portal.core.command.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.core.command.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.core.command.mapper;
 
+import org.jboss.portal.core.command.ControllerCommand;
 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.core.command.ControllerCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -37,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactoryDelegate.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactoryDelegate.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/mapper/URLFactoryDelegate.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.mapper;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.portlet;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.core.command.ExecutionContext;
 import org.jboss.portal.core.model.portal.Portal;
 import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.portlet.spi.ActionContext;
+import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.portlet.StateString;
+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.spi.ActionContext;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.portlet.Parameters;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,56 +1,57 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.command.portlet;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.core.command.ControllerCommand;
+import org.jboss.portal.core.command.ExecutionContext;
+import org.jboss.portal.core.command.InvokeWindowActionCommand;
+import org.jboss.portal.core.command.InvokeWindowRenderCommand;
+import org.jboss.portal.core.model.portal.Portal;
+import org.jboss.portal.core.model.portal.PortalContextImpl;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.portal.WindowContextImpl;
+import org.jboss.portal.portlet.ActionURL;
+import org.jboss.portal.portlet.PortletURL;
+import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.impl.spi.AbstractInvocationContext;
+import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.spi.InvocationContext;
 import org.jboss.portal.portlet.spi.PortalContext;
 import org.jboss.portal.portlet.spi.RequestContext;
 import org.jboss.portal.portlet.spi.SecurityContext;
 import org.jboss.portal.portlet.spi.UserContext;
 import org.jboss.portal.portlet.spi.WindowContext;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
-import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
-import org.jboss.portal.portlet.impl.spi.AbstractInvocationContext;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.core.command.ExecutionContext;
-import org.jboss.portal.core.command.ControllerCommand;
-import org.jboss.portal.core.command.InvokeWindowActionCommand;
-import org.jboss.portal.core.command.InvokeWindowRenderCommand;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.model.portal.PortalContextImpl;
-import org.jboss.portal.core.model.portal.WindowContextImpl;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerResponse;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
-import org.jboss.portal.portlet.PortletURL;
-import org.jboss.portal.portlet.ActionURL;
-import org.jboss.portal.portlet.RenderURL;
-import org.jboss.portal.Mode;
 import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.WindowState;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -183,7 +184,7 @@
       return executionContext.encodeURL(cmd, info, URLFormat.newInstance(relative, true));
    }
 
-  public PortletInvocation createInvocation()
+   public PortletInvocation createInvocation()
    {
       PortletInvocation invocation = newInvocation();
 

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.mx.util.MBeanProxyExt;
-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.common.util.Tools;
+import org.jboss.portal.common.util.XML;
 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.PreferencesMetaData;
 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.portlet.impl.jsr168.metadata.PreferenceMetaData;
 import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
-import org.jboss.portal.security.metadata.SecurityConstraintsMetaData;
 import org.jboss.portal.server.deployment.PortalWebApp;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -47,11 +45,11 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.xml.parsers.DocumentBuilder;
-import java.io.InputStream;
 import java.io.File;
+import java.io.InputStream;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -150,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;
@@ -164,7 +164,7 @@
                         in = 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);
@@ -287,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
@@ -311,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.system.AbstractJBossService;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.instance;
 
+import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.core.model.instance.Instance;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.HibernateException;
+import org.jboss.portal.Mode;
 import org.jboss.portal.common.value.ValueMap;
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.jems.hibernate.ContextObject;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.spi.UserContext;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.Mode;
-import org.jboss.portal.jems.hibernate.ContextObject;
-import org.apache.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -286,8 +287,8 @@
             {
                if (debug)
                {
-                 log.debug("About to reference clone of (" + instanceId + "," + portletId +
-                           ") having id " + instanceContext.cloneId + " for user " + userId);
+                  log.debug("About to reference clone of (" + instanceId + "," + portletId +
+                     ") having id " + instanceContext.cloneId + " for user " + userId);
                }
                UserInstance userInstance = new UserInstance(userId, instanceContext.cloneId);
                session.persist(userInstance);

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -31,6 +32,7 @@
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.instance.InstancePermission;
 import org.jboss.portal.core.model.instance.NoSuchInstanceException;
+import org.jboss.portal.jems.hibernate.ObjectContextualizer;
 import org.jboss.portal.portlet.InvokerUnavailableException;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.PortletInvoker;
@@ -47,7 +49,6 @@
 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 javax.naming.InitialContext;
 import java.util.Collection;

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.system.AbstractJBossService;
 import org.jboss.portal.core.event.PortalEventListenerRegistry;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.common.system.AbstractJBossService;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 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.logging.Logger;
 
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -105,9 +106,7 @@
       this.object = object;
    }
 
-   /**
-    * Create the association.
-    */
+   /** Create the association. */
    void addChild(String name, PortalObjectImpl childObject) throws DuplicatePortalObjectException, IllegalArgumentException
    {
       if (name == null)
@@ -144,9 +143,7 @@
       childNode.parent = this;
    }
 
-   /**
-    * Destroy the association.
-    */
+   /** Destroy the association. */
    void removeChild(String name) throws NoSuchPortalObjectException, IllegalArgumentException
    {
       if (name == null)
@@ -162,7 +159,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);

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,58 +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.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.api.node.event.PortalNodeEventListener;
 import org.jboss.portal.core.api.JBossPortalNode;
 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.security.impl.JBossAuthorizationDomainRegistry;
+import org.jboss.portal.jems.hibernate.ObjectContextualizer;
 import org.jboss.portal.security.PortalPermission;
 import org.jboss.portal.security.PortalPermissionCollection;
 import org.jboss.portal.security.PortalSecurityException;
-import org.jboss.portal.security.SecurityConstants;
 import org.jboss.portal.security.RoleSecurityBinding;
+import org.jboss.portal.security.SecurityConstants;
+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.hibernate.ObjectContextualizer;
-import org.jboss.portal.api.node.event.PortalNodeEventListener;
+import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 
 import javax.naming.InitialContext;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -100,6 +100,7 @@
             }
             return null;
          }
+
          public PortalObjectContainer getContainer()
          {
             return PersistentPortalObjectContainer.this;
@@ -188,12 +189,10 @@
       sessionFactory = null;
    }
 
-   /**
-    * @see PortalObjectContainer#getAuthorizationDomain()
-    */
+   /** @see PortalObjectContainer#getAuthorizationDomain() */
    public AuthorizationDomain getAuthorizationDomain()
    {
-     return this;
+      return this;
    }
 
    public void createContext()
@@ -240,37 +239,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 = lookup(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 = lookup(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
@@ -319,21 +316,21 @@
 
    public void setBindings(String uri, Set bindings) throws SecurityConfigurationException
    {
-      setConstraints(uri,bindings,sessionFactory.getCurrentSession());
+      setConstraints(uri, bindings, sessionFactory.getCurrentSession());
    }
 
    public void removeBindings(String uri) throws SecurityConfigurationException
    {
-      removeConstraints(uri,sessionFactory.getCurrentSession());
+      removeConstraints(uri, sessionFactory.getCurrentSession());
    }
 
    public PortalPermission getPermission(String roleName, String uri) throws PortalSecurityException
    {
-      if(sessionFactory == null)
+      if (sessionFactory == null)
       {
          throw new IllegalStateException("sessionFactory is null");
       }
-      Set set = getConstraints(uri,sessionFactory.getCurrentSession());
+      Set set = getConstraints(uri, sessionFactory.getCurrentSession());
       if (set != null && !set.isEmpty())
       {
          for (Iterator i = set.iterator(); i.hasNext();)
@@ -356,18 +353,18 @@
 
    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);
    }
 
    private void removeConstraints(String uri, Session session) throws SecurityConfigurationException
    {
       ObjectNode on = lookup(session, uri);
-      if(on != null)
+      if (on != null)
       {
          on.getSecurityConstraints().clear();
          session.flush();
@@ -381,7 +378,7 @@
    private void setConstraints(String uri, Set constraints, Session session) throws SecurityConfigurationException
    {
       ObjectNode on = lookup(session, uri);
-      if(on  == null)
+      if (on == null)
       {
          throw new SecurityConfigurationException("The object should exist prior its security is configured : fixme");
       }
@@ -390,7 +387,7 @@
       on.getSecurityConstraints().clear();
       for (Iterator i = on.getSecurityConstraints().values().iterator(); i.hasNext();)
       {
-         ObjectNodeSecurityConstraint onsc =  (ObjectNodeSecurityConstraint)i.next();
+         ObjectNodeSecurityConstraint onsc = (ObjectNodeSecurityConstraint)i.next();
          i.remove();
          onsc.setObjectNode(null);
       }
@@ -403,7 +400,7 @@
          // Optmize a bit
          if (sc.getActions().size() > 0)
          {
-            ObjectNodeSecurityConstraint onsc =  new ObjectNodeSecurityConstraint(sc.getActions(),sc.getRole());
+            ObjectNodeSecurityConstraint onsc = new ObjectNodeSecurityConstraint(sc.getActions(), sc.getRole());
 
             //
             onsc.setObjectNode(on);

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.model.portal;
 
-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.jboss.portal.core.api.JBossPortalNode;
-import org.jboss.portal.common.path.RelativePathParser;
+import org.apache.log4j.Logger;
 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.apache.log4j.Logger;
+import org.jboss.portal.common.path.RelativePathParser;
+import org.jboss.portal.core.api.JBossPortalNode;
+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.PortalObjectContainer;
 
+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>
@@ -146,46 +147,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();
@@ -195,10 +207,12 @@
                   {
                      throw new UnsupportedOperationException();
                   }
+
                   public boolean hasNext()
                   {
                      return iterator.hasNext();
                   }
+
                   public Object next()
                   {
                      ObjectNode next = (ObjectNode)iterator.next();
@@ -206,6 +220,7 @@
                   }
                };
             }
+
             public Object[] toArray(Object a[])
             {
                ArrayList tmp = new ArrayList(objectNode.getChildren().size());
@@ -321,13 +336,13 @@
 
       //
       RelativePathParser cursor = new RelativePathParser(relativePath);
-      for (int i = cursor.next();i != RelativePathParser.NONE && o != null;i = cursor.next())
+      for (int i = cursor.next(); i != RelativePathParser.NONE && o != null; i = cursor.next())
       {
          switch (i)
          {
             case RelativePathParser.DOWN:
                String name = relativePath.substring(cursor.getOffset(), cursor.getOffset() + cursor.getLength());
-                o = o.getChild(name);
+               o = o.getChild(name);
                break;
             case RelativePathParser.UP:
                o = o.getParent();
@@ -360,6 +375,7 @@
       {
          return object.getType();
       }
+
       public PortalNode getRoot()
       {
          if (object.getObjectNode().getParent().getObject() instanceof ContextImpl)
@@ -369,9 +385,10 @@
          else
          {
             // return object.theparent.getPortalNode();
-           throw new UnsupportedOperationException();
+            throw new UnsupportedOperationException();
          }
       }
+
       public PortalNode getParent()
       {
          if (object.getObjectNode().getParent() != null)
@@ -383,10 +400,12 @@
             return null;
          }
       }
+
       public String getName()
       {
          return object.getObjectNode().getName();
       }
+
       public PortalNode getChild(String name)
       {
          PortalObjectImpl child = (PortalObjectImpl)object.getChild(name);
@@ -399,6 +418,7 @@
             return null;
          }
       }
+
       public Collection getChildren()
       {
          if (children == null)
@@ -407,6 +427,7 @@
          }
          return children;
       }
+
       public PortalNode resolve(String relativePath)
       {
          PortalObjectImpl relative = (PortalObjectImpl)object.resolve(relativePath);
@@ -602,10 +623,12 @@
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean hasNext()
             {
                return iterator.hasNext();
             }
+
             public Object next()
             {
                ObjectNode next = (ObjectNode)iterator.next();
@@ -620,10 +643,7 @@
       }
    }
 
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.impl.model.portal;
 
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.api.node.event.PortalNodeEventListener;
+import org.jboss.portal.core.api.JBossPortalNode;
+import org.jboss.portal.core.event.PortalEventListenerRegistry;
 import org.jboss.portal.core.model.portal.Context;
 import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
-import org.jboss.portal.core.api.JBossPortalNode;
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.api.node.event.PortalNodeEventListener;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -58,13 +58,16 @@
             }
             return null;
          }
+
          public PortalObjectContainer getContainer()
          {
             return TransientPortalObjectContainer.this;
          }
+
          public void destroyChild(ObjectNode node)
          {
          }
+
          public void createChild(ObjectNode node)
          {
          }
@@ -130,9 +133,7 @@
       }
    }
 
-   /**
-    * @see PortalObjectContainer#getAuthorizationDomain()
-    */
+   /** @see PortalObjectContainer#getAuthorizationDomain() */
    public AuthorizationDomain getAuthorizationDomain()
    {
       throw new IllegalStateException("Unimplemented");

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.value.Value;
+import org.jboss.portal.common.value.ValueMap;
 import org.jboss.portal.portlet.state.producer.State;
-import org.jboss.portal.common.value.ValueMap;
-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>
@@ -139,6 +140,7 @@
          {
             return entries.keySet();
          }
+
          public Value getValue(String key) throws IllegalArgumentException
          {
             PersistentStateEntry entry = (PersistentStateEntry)entries.get(key);
@@ -151,6 +153,7 @@
                return entry.getValue();
             }
          }
+
          public void setValue(String key, Value value) throws IllegalArgumentException, UnsupportedOperationException
          {
          }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.state.producer.InvalidStateIdException;
+import org.jboss.portal.portlet.state.producer.NoSuchStateException;
+import org.jboss.portal.portlet.state.producer.State;
 import org.jboss.portal.portlet.state.producer.StateStore;
-import org.jboss.portal.portlet.state.producer.State;
-import org.jboss.portal.portlet.state.producer.NoSuchStateException;
-import org.jboss.portal.portlet.state.producer.InvalidStateIdException;
-import org.jboss.portal.common.value.ValueMap;
-import org.jboss.portal.common.value.Value;
-import org.jboss.portal.common.value.SimpleValueMap;
-import org.jboss.portal.common.system.AbstractJBossService;
-import org.hibernate.SessionFactory;
-import org.hibernate.Session;
-import org.hibernate.Query;
 
 import javax.naming.InitialContext;
 import java.util.Iterator;
@@ -61,7 +62,7 @@
 
    public State loadState(String id) throws InvalidStateIdException, NoSuchStateException
    {
-      if(id == null)
+      if (id == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }
@@ -75,7 +76,7 @@
 
    public String createState(String portletId, ValueMap valueMap)
    {
-      if(portletId == null)
+      if (portletId == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }
@@ -98,7 +99,7 @@
 
    public String cloneState(String stateId, ValueMap valueMap) throws InvalidStateIdException, NoSuchStateException
    {
-      if(stateId == null)
+      if (stateId == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }
@@ -131,7 +132,7 @@
 
    public String cloneState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
    {
-      if(stateId == null)
+      if (stateId == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/StatefulPortletInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/StatefulPortletInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/StatefulPortletInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.state;
 
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.common.invocation.InvocationException;
 
 /**
  * The subclass is used to be able to add AOP behavior.
@@ -37,10 +38,12 @@
    {
       return super.createClone(portletId);
    }
+
    public void destroyClone(String portletId) throws PortletInvokerException
    {
       super.destroyClone(portletId);
    }
+
    public void invoke(PortletInvocation invocation) throws PortletInvokerException, InvocationException
    {
       super.invoke(invocation);

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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.common.value.ValueMap;
+import org.jboss.portal.common.value.SimpleValueMap;
 import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.common.value.Value;
-import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.ValueMap;
+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.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.
@@ -124,7 +125,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);
@@ -151,7 +152,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)
    {
@@ -199,7 +200,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 @@
       if (preferences != null && preferences.size() > 0)
       {
          ValueMap prefs = new SimpleValueMap();
-         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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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,19 +28,17 @@
 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;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -115,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
@@ -234,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/Instance.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/Instance.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/Instance.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.common.value.ValueMap;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.security.spi.provider.AuthorizationDomain;
+
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 
 import java.util.Collection;
 
@@ -38,7 +39,7 @@
 
    /**
     * Return the underlying portlet invoker for the instance container.
-    * 
+    *
     * @return the portlet invoker
     */
    PortletInvoker getPortletInvoker();
@@ -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
     */
    Instance 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
     */
    Instance 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -27,9 +28,9 @@
 import org.jboss.portal.security.spi.provider.PermissionRepository;
 
 import java.security.Permission;
-import java.util.StringTokenizer;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.StringTokenizer;
 
 /**
  * The permission for instance.
@@ -38,7 +39,7 @@
  * @version $Revision$
  */
 public final class InstancePermission extends PortalPermission
-{  
+{
 
    /** The serialVersionUID */
    private static final long serialVersionUID = 8445291296726152562L;
@@ -69,7 +70,7 @@
    public InstancePermission(String uri, Collection actions)
    {
       super("instancepermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -91,7 +92,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -37,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Context.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Context.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Context.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.mapper.CommandFactory;
 import org.jboss.portal.core.command.ControllerCommand;
 import org.jboss.portal.core.command.RenderPageCommand;
 import org.jboss.portal.core.command.mapper.AbstractCommandFactory;
+import org.jboss.portal.core.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/MaskNames.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/MaskNames.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/MaskNames.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Page.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Page.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Page.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.theme.page.MarkupContainer;
@@ -29,14 +30,10 @@
  */
 public interface Page extends PageContainer, MarkupContainer
 {
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Portal.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Portal.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Portal.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.model.portal;
 
-import java.util.Map;
 import java.util.Collection;
-import java.util.Set;
+import java.util.Map;
 
 /**
  * The base interface for all portal objects.
@@ -34,14 +34,10 @@
 public interface PortalObject
 {
 
-   /**
-    * Portal property name that indicates the name of the default portal to lookup.
-    */
+   /** Portal property name that indicates the name of the default portal to lookup. */
    String PORTAL_PROP_DEFAULT_OBJECT_NAME = "portal.defaultObjectName";
 
-   /**
-    * The default portal name.
-    */
+   /** The default portal name. */
    String DEFAULT_OBJECT_NAME = "default";
 
    int TYPE_CONTEXT = 0;
@@ -49,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();
 
    /**
@@ -80,9 +72,7 @@
     */
    String getListener();
 
-   /**
-    * Set a listener id.
-    */
+   /** Set a listener id. */
    void setListener(String listener);
 
    /**

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.api.JBossPortalNode;
@@ -32,28 +33,18 @@
  */
 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();
 
-   /**
-    * Return the api node.
-    */
+   /** Return the api node. */
    JBossPortalNode getNode(String id);
-   
-   /**
-    * Get the authorization domain 
-    */
+
+   /** Get the authorization domain */
    AuthorizationDomain getAuthorizationDomain();
 }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.PortalPermission;
@@ -27,9 +28,9 @@
 import org.jboss.portal.security.spi.provider.PermissionRepository;
 
 import java.security.Permission;
-import java.util.StringTokenizer;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.StringTokenizer;
 
 /**
  * The permission for portal objects hierarchy.
@@ -38,14 +39,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";
 
@@ -60,14 +61,14 @@
 
    /** 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 action names. */
@@ -95,7 +96,7 @@
       super("portalobjectpermission", uri);
 
       //
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -114,7 +115,7 @@
    public PortalObjectPermission(String uri, String actions)
    {
       super("portalobjectpermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -158,7 +159,7 @@
       else if (CREATE_ACTION.equals(action))
       {
          mask |= CREATE_MASK;
-      } 
+      }
       else if (PERSONALIZE_ACTION.equals(action))
       {
          mask |= PERSONALIZE_MASK;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.command.ControllerCommand;
 import org.jboss.portal.core.command.InvokeWindowActionCommand;
@@ -28,15 +31,13 @@
 import org.jboss.portal.core.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.command.RenderPageCommand;
 import org.jboss.portal.core.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 prefix;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Window.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Window.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/model/portal/Window.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 handle.
-    */
+   /** Return the instance handle. */
    String getInstanceRef();
 
-   /**
-    * Update the instance handle.
-    */
+   /** Update the instance handle. */
    void setInstanceRef(String instanceHandle);
 }

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.JBossPortalNode;
-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 JBossPortalNode)
+                        if (child instanceof JBossPortalNode)
                         {
-                           JBossPortalNode pn = (JBossPortalNode) child;
+                           JBossPortalNode pn = (JBossPortalNode)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 JBossPortalNode)
+                  if (parentSibling instanceof JBossPortalNode)
                   {
-                     JBossPortalNode pn = (JBossPortalNode) parentSibling;
+                     JBossPortalNode pn = (JBossPortalNode)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,13 +155,13 @@
          PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/catalog/index.jsp");
          prd.include(req, resp);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }
 //      }
    }
-   
+
 //   private PortalAuthorizationManager getPortalAuthorizationManager()
 //   {
 //      String type = PortalAuthorizationManagerFactory.JACC;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/NavigationPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/NavigationPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/catalog/NavigationPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.catalog;
 
+import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.portal.core.api.JBossPortalNode;
 import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
 import org.jboss.portal.core.model.portal.Context;
@@ -28,14 +31,12 @@
 import org.jboss.portal.core.model.portal.Portal;
 import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.core.model.portal.PortalObjectPermission;
 import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.PortalObjectPermission;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
-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.PortletPreferences;
@@ -47,7 +48,6 @@
 import java.util.List;
 
 /**
- *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$
  */
@@ -87,32 +87,40 @@
 
          // get the list of portal nodes to display (portals or pages, based on preference)
          Iterator portalObjectIterator;
-         if ("page".equalsIgnoreCase(rootLevel)){
+         if ("page".equalsIgnoreCase(rootLevel))
+         {
             // if the pages of the current portal are requested, then read up the hierarchie to the current portal, to
             // get the children from there (which are the pages to display)
             PortalNode current = req.getPortalNode();
-            while(current != null && current.getType() != PortalNode.TYPE_PORTAL){
+            while (current != null && current.getType() != PortalNode.TYPE_PORTAL)
+            {
                current = current.getParent();
             }
-            if(current != null && current.getType() == PortalNode.TYPE_PORTAL){
+            if (current != null && current.getType() == PortalNode.TYPE_PORTAL)
+            {
                PortalObject root = context.getChild(current.getName());
                portalObjectIterator = root.getChildren().iterator();
             }
-            else{
+            else
+            {
                throw new PortletException("the current node has no parent of type 'portal'");
             }
          }
-         else{
+         else
+         {
             // ok, we are to display portals then; they are the children of the container root
             portalObjectIterator = context.getChildren().iterator();
          }
          // now build the list
-         while(portalObjectIterator.hasNext()){
+         while (portalObjectIterator.hasNext())
+         {
             PortalObject child = (PortalObject)portalObjectIterator.next();
             if (child.getType() == PortalNode.TYPE_PAGE ||
-                child.getType() == PortalNode.TYPE_PORTAL){
+               child.getType() == PortalNode.TYPE_PORTAL)
+            {
                PortalObjectImpl portalObject = (PortalObjectImpl)child;
-               if (allowed(portalObject.getPortalNode(), child.getType())){
+               if (allowed(portalObject.getPortalNode(), child.getType()))
+               {
                   navElements.add(portalObject);
                }
             }
@@ -139,55 +147,68 @@
          // from the current portal node walk up the hierarchie until the node type matches
          // that of the nav elements; if there is a match, hold on to it to mark the selected item later on
          PortalNode selectedNode = null;
-         if (navElements.size() > 0){
+         if (navElements.size() > 0)
+         {
             PortalObject first = (PortalObject)navElements.get(0);
             int navElementType = first.getType();
             PortalNode current = req.getPortalNode();
-            while(current != null && current.getType() != navElementType){
+            while (current != null && current.getType() != navElementType)
+            {
                current = current.getParent();
             }
 
             // now read up the hierarchie within the same node type until the type changes, to find the top level node of that type
-            if (current.getParent() != null){
+            if (current.getParent() != null)
+            {
                PortalNode sameTypeLevelUp = current;
-               while(sameTypeLevelUp != null && sameTypeLevelUp.getType() == current.getType()){
+               while (sameTypeLevelUp != null && sameTypeLevelUp.getType() == current.getType())
+               {
                   current = sameTypeLevelUp;
                   sameTypeLevelUp = current.getParent();
                }
             }
 
-            if (current != null && current.getType() == navElementType){
+            if (current != null && current.getType() == navElementType)
+            {
                selectedNode = current;
             }
          }
 
          StringBuffer html = new StringBuffer();
          html.append("<ul id=\"tabsHeader\">");
-         for (Iterator i=navElements.iterator(); i.hasNext(); ){
+         for (Iterator i = navElements.iterator(); i.hasNext();)
+         {
             PortalObjectImpl navElement = (PortalObjectImpl)i.next();
 
             // build up Marks markup for the navigation , based on these nodes
             String name = navElement.getName();
             JBossPortalNode urlNode = null;
-            if (navElement instanceof Portal){
+            if (navElement instanceof Portal)
+            {
                // get the default page node for this portal to get a valid URL from it
                Page defaultPage = ((Portal)navElement).getDefaultPage();
-               if(defaultPage != null){
+               if (defaultPage != null)
+               {
                   PortalObject node = navElement.getChild(defaultPage.getName());
-                  if (node instanceof PortalObjectImpl){
+                  if (node instanceof PortalObjectImpl)
+                  {
                      urlNode = ((PortalObjectImpl)node).getPortalNode();
                   }
                }
-            }else if (navElement instanceof Page){
+            }
+            else if (navElement instanceof Page)
+            {
                urlNode = navElement.getPortalNode();
             }
 
-            if (urlNode != null){
+            if (urlNode != null)
+            {
                PortalNodeURL childURL = resp.createRenderURL(urlNode);
                html.append("<li");
                // if we were able to detect the selected node in the hierarchie level of the nav elements,
                // then flag the node so the css can style it as the selected one
-               if (selectedNode != null && selectedNode.equals(navElement.getPortalNode())){
+               if (selectedNode != null && selectedNode.equals(navElement.getPortalNode()))
+               {
                   html.append(" id=\"current\"");
                }
                html.append(" onmouseover=\"this.className='hoverOn'\" onmouseout=\"this.className='hoverOff'\"><a href='").append(childURL).append("'>").append(name).append("</a></li>");
@@ -197,7 +218,7 @@
          ///write it out
          resp.getWriter().write(html.toString());
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          // todo: handle error case : write it out
          e.printStackTrace();

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -30,7 +31,6 @@
 import org.jboss.portal.core.cms.command.StreamContentCommand;
 import org.jboss.portal.core.command.portlet.CoreInvocationContext;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.server.request.URLContext;
 import org.jboss.portlet.JBossRenderResponse;
 
 import javax.portlet.GenericPortlet;
@@ -63,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" +
@@ -111,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>.*')";
 
@@ -121,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");
       }
@@ -152,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");
@@ -161,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());
@@ -186,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());
@@ -211,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);
@@ -224,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);
@@ -239,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());
             }
@@ -253,7 +243,7 @@
          writer.write(sHTML);
          writer.close();
       }
-      catch(CMSException e)
+      catch (CMSException e)
       {
          log.error("CMS error", e);
       }
@@ -266,8 +256,8 @@
    public String buildURL(RenderResponse resp, String path)
    {
       StreamContentCommand cmd = new StreamContentCommand(path);
-      PortletInvocation invocation = ((JBossRenderResponse) resp).getInvocation();
-      CoreInvocationContext ccrc = (CoreInvocationContext) invocation.getContext();
+      PortletInvocation invocation = ((JBossRenderResponse)resp).getInvocation();
+      CoreInvocationContext ccrc = (CoreInvocationContext)invocation.getContext();
       return ccrc.encodeURL(cmd, null, true);
    }
 

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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.common.value.ValueMap;
 import org.jboss.portal.core.model.instance.Instance;
@@ -37,9 +38,8 @@
 import org.jboss.portal.identity.RoleModule;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.container.PortletContainer;
-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.security.AuthorizationDomainRegistry;
 import org.jboss.portal.security.SecurityConstants;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
@@ -49,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>
@@ -65,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;
@@ -232,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();
@@ -257,7 +237,7 @@
                + ". This instance won't be listed.\nReason:\n\t" + e.getLocalizedMessage());
          }
       }
-      
+
       try
       {
          sortInstances(instances, sortColumn, sortAscending);
@@ -313,9 +293,7 @@
       }
    }
 
-   /**
-    * Refresh the selected prefs.
-    */
+   /** Refresh the selected prefs. */
    public void refresh()
    {
       selectedPreferences = null;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.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.api.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,61 +1,61 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.core.model.instance.Instance;
 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.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
+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 +65,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 +283,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.setBindings(page.getId(), constraints);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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.server.PortalConstants;
-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>
@@ -51,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()
@@ -104,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);
       }
@@ -113,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.common.value.SimpleValueMap;
@@ -31,8 +32,6 @@
 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.portlet.InvokerUnavailableException;
-import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.PortletInvokerException;
 
 import java.util.ArrayList;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -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;
@@ -641,9 +634,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;
@@ -662,9 +653,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.Writer;
-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.Writer;
+import java.util.Enumeration;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -84,7 +84,7 @@
    {
       writer.write("<table>");
       writer.write("<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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.JBossPortalNode;
 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.JBossPortalNode;
 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -69,59 +70,41 @@
  * @version $Revision$
  */
 public class UserPortlet
-      extends JBossPortlet
+   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 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;
    private RoleModule roleModule;
    private MailModule mailModule;
    private PortletHelper portletHelper;
-   public static final short UNDEFINED_TIMEZONE = (short) 0;
+   public static final short UNDEFINED_TIMEZONE = (short)0;
 
    /**
     * init method of the portlet, Setting up the diffrent modules used.
@@ -129,26 +112,26 @@
     * @throws PortletException If a module cannot be looked up.
     */
    public void init()
-         throws PortletException
+      throws PortletException
    {
       super.init();
 
       //
-      userModule = (UserModule) getPortletContext().getAttribute("UserModule");
-      roleModule = (RoleModule) getPortletContext().getAttribute("RoleModule");
-      mailModule = (MailModule) getPortletContext().getAttribute("MailModule");
+      userModule = (UserModule)getPortletContext().getAttribute("UserModule");
+      roleModule = (RoleModule)getPortletContext().getAttribute("RoleModule");
+      mailModule = (MailModule)getPortletContext().getAttribute("MailModule");
       portletHelper = new PortletHelper(this);
 
       //
-      if(userModule == null)
+      if (userModule == null)
       {
          throw new PortletException("No user module");
       }
-      if(roleModule == null)
+      if (roleModule == null)
       {
          throw new PortletException("No role module");
       }
-      if(mailModule == null)
+      if (mailModule == null)
       {
          throw new PortletException("No mail module");
       }
@@ -180,22 +163,22 @@
     * @throws IOException              DOCUMENT_ME
     */
    protected void doView(JBossRenderRequest req, JBossRenderResponse resp)
-         throws PortletException,
-                PortletSecurityException,
-                IOException
+      throws PortletException,
+      PortletSecurityException,
+      IOException
    {
       String op;
       resp.setContentType("text/html");
       PrintWriter writer = resp.getWriter();
 
-      if((req.getUser() != null) && (!req.getUser().getEnabled()))
+      if ((req.getUser() != null) && (!req.getUser().getEnabled()))
       {
          req.getPortletSession().invalidate();
          PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
          PortalNode currentNode = req.getPortalNode();
          PortalNodeURL url = resp.createRenderURL(currentNode);
          url.setAuthenticated(Boolean.TRUE);
-         if("1".equals(getPortletConfig().getInitParameter("useSSL")))
+         if ("1".equals(getPortletConfig().getInitParameter("useSSL")))
          {
             url.setSecure(Boolean.TRUE);
             req.setAttribute("secureURL", url.toString());
@@ -206,18 +189,18 @@
          return;
       }
 
-      if(req.getRemoteUser() != null)
+      if (req.getRemoteUser() != null)
       {
-         if(req.getWindowState() != WindowState.MAXIMIZED)
+         if (req.getWindowState() != WindowState.MAXIMIZED)
          {
             op = OP_SHOWMENU;
          }
          else
          {
             op = req.getParameters().get(getOperationName(),
-                                         OP_SHOWMENU);
+               OP_SHOWMENU);
             // Because of the automatic redirection
-            if(op.equals(OP_SHOWLOGIN))
+            if (op.equals(OP_SHOWLOGIN))
             {
                op = OP_SHOWMENU;
             }
@@ -225,17 +208,17 @@
 
          Locale requestLocale = req.getLocale();
          ResourceBundle bundle = getResourceBundle(requestLocale);
-         if(OP_SHOWPROFILE.equals(op))
+         if (OP_SHOWPROFILE.equals(op))
          {
             String userid = req.getParameters().getParameter("userid");
             User user = null;
-            if(userid != null)
+            if (userid != null)
             {
                try
                {
                   user = userModule.findUserById(userid);
                }
-               catch(Exception e)
+               catch (Exception e)
                {
                   log.error("Cannot retrive user", e);
                }
@@ -246,7 +229,7 @@
             }
 
             // Validate we have a user object
-            if(user == null)
+            if (user == null)
             {
                throw new PortletException("Not user object found");
             }
@@ -259,15 +242,15 @@
             fillContextWithUserProfile(user, ctx);
 
             //
-            String selectedTimeZone = (String) user.getProperties().get(User.INFO_USER_TIME_ZONE_OFFSET);
-            for(int i = 0; i < UserPortletConstants.TIME_ZONE_OFFSETS.length; i++)
+            String selectedTimeZone = (String)user.getProperties().get(User.INFO_USER_TIME_ZONE_OFFSET);
+            for (int i = 0; i < UserPortletConstants.TIME_ZONE_OFFSETS.length; i++)
             {
-               if(UserPortletConstants.TIME_ZONE_OFFSETS[i] != null)
+               if (UserPortletConstants.TIME_ZONE_OFFSETS[i] != null)
                {
                   DelegateContext timeZoneCtx = ctx.next("timezone");
                   timeZoneCtx.put("name", UserPortletConstants.TIME_ZONE_OFFSETS[i]);
                   timeZoneCtx.put("id", "" + i);
-                  if(selectedTimeZone != null && selectedTimeZone.equals("" + i))
+                  if (selectedTimeZone != null && selectedTimeZone.equals("" + i))
                   {
                      timeZoneCtx.put("selected", "selected");
                   }
@@ -275,31 +258,31 @@
             }
 
             //
-            String selectedLocale = (String) user.getProperties().get(User.INFO_USER_LOCALE);
-            for(Iterator i = LocaleInfo.getAll().iterator(); i.hasNext();)
+            String selectedLocale = (String)user.getProperties().get(User.INFO_USER_LOCALE);
+            for (Iterator i = LocaleInfo.getAll().iterator(); i.hasNext();)
             {
-               LocaleInfo info = (LocaleInfo) i.next();
+               LocaleInfo info = (LocaleInfo)i.next();
                Locale locale = info.getLocale();
                DelegateContext localeCtx = ctx.next("locale");
                localeCtx.put("name", locale.getDisplayName(requestLocale));
                localeCtx.put("id", locale.toString());
-               if(selectedLocale != null && selectedLocale.equals(locale.toString()))
+               if (selectedLocale != null && selectedLocale.equals(locale.toString()))
                {
                   localeCtx.put("selected", "selected");
                }
             }
 
             //
-            String selectedTheme = (String) user.getProperties().get(User.INFO_USER_THEME);
-            ThemeService themeService = (ThemeService) getPortletContext().getAttribute("ThemeService");
-            for(Iterator i = themeService.getThemes().iterator(); i.hasNext();)
+            String selectedTheme = (String)user.getProperties().get(User.INFO_USER_THEME);
+            ThemeService themeService = (ThemeService)getPortletContext().getAttribute("ThemeService");
+            for (Iterator i = themeService.getThemes().iterator(); i.hasNext();)
             {
-               PortalTheme theme = (PortalTheme) i.next();
+               PortalTheme theme = (PortalTheme)i.next();
                ThemeInfo info = theme.getThemeInfo();
                DelegateContext themeCtx = ctx.next("theme");
                themeCtx.put("name", info.getAppId() + "." + info.getName());
                themeCtx.put("id", info.getRegistrationId().toString());
-               if((selectedTheme != null) && selectedTheme.equals(info.getRegistrationId().toString()))
+               if ((selectedTheme != null) && selectedTheme.equals(info.getRegistrationId().toString()))
                {
                   themeCtx.put("selected", "selected");
                }
@@ -311,10 +294,10 @@
             PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/editProfile.jsp");
             rd.include(req, resp);
          }
-         else if(OP_SHOWMENU.equals(op))
+         else if (OP_SHOWMENU.equals(op))
          {
             DelegateContext ctx = new DelegateContext();
-            if(req.isUserInRole("Admin"))
+            if (req.isUserInRole("Admin"))
             {
                ctx.next("admin");
             }
@@ -323,9 +306,9 @@
             rd.include(req, resp);
 
          }
-         else if(OP_SHOWLISTUSERS.equals(op))
+         else if (OP_SHOWLISTUSERS.equals(op))
          {
-            if(req.isUserInRole("Admin"))
+            if (req.isUserInRole("Admin"))
             {
                try
                {
@@ -337,7 +320,7 @@
                   // a next page
                   // It's tricky but it avoids to make 2 queries.
                   Set users = null;
-                  if(usernameFilter.trim().length() == 0)
+                  if (usernameFilter.trim().length() == 0)
                   {
                      users = userModule.findUsers(offset, usersPerPage + 1);
                   }
@@ -347,15 +330,15 @@
                   }
 
                   User[] usersArray = new User[users.size()];
-                  usersArray = (User[]) users.toArray(usersArray);
+                  usersArray = (User[])users.toArray(usersArray);
                   DelegateContext ctx = new DelegateContext();
 
                   DelegateContext rowCtx = null;
-                  for(int i = 0; i < Math.min(usersArray.length, usersPerPage); i++)
+                  for (int i = 0; i < Math.min(usersArray.length, usersPerPage); i++)
                   {
                      int oddeven = i % 2;
                      User user = usersArray[i];
-                     if(oddeven == 0)
+                     if (oddeven == 0)
                      {
                         rowCtx = ctx.next("row");
                      }
@@ -365,10 +348,10 @@
 
                      //
                      Iterator itRoles = roleModule.getRoles(user).iterator();
-                     while(itRoles.hasNext())
+                     while (itRoles.hasNext())
                      {
                         DelegateContext rolesCtx = rowCtx.next("roles" + oddeven);
-                        rolesCtx.put("name", ((Role) itRoles.next()).getDisplayName());
+                        rolesCtx.put("name", ((Role)itRoles.next()).getDisplayName());
                      }
 
                      PortletURL editURL = resp.createRenderURL();
@@ -388,7 +371,7 @@
                      rowCtx.put("deleteURL" + oddeven, deleteUrl.toString());
                   }
 
-                  if(offset != 0)
+                  if (offset != 0)
                   {
                      PortletURL previousPageLink = resp.createRenderURL();
                      previousPageLink.setParameter(getOperationName(), OP_SHOWLISTUSERS);
@@ -399,7 +382,7 @@
                      previousCtx.put("link", previousPageLink.toString());
                   }
 
-                  if(usersArray.length > usersPerPage)
+                  if (usersArray.length > usersPerPage)
                   {
                      PortletURL nextPageLink = resp.createRenderURL();
                      nextPageLink.setParameter(getOperationName(), OP_SHOWLISTUSERS);
@@ -413,12 +396,12 @@
                   ctx.put("usernamefilter", usernameFilter);
                   req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
                }
-               catch(IllegalArgumentException e)
+               catch (IllegalArgumentException e)
                {
                   // TODO Auto-generated catch block
                   e.printStackTrace();
                }
-               catch(IdentityException e)
+               catch (IdentityException e)
                {
                   // TODO Auto-generated catch block
                   e.printStackTrace();
@@ -428,9 +411,9 @@
                rd.include(req, resp);
             }
          }
-         else if(OP_SHOWADDROLESTOUSER.equals(op))
+         else if (OP_SHOWADDROLESTOUSER.equals(op))
          {
-            if(req.isUserInRole("Admin"))
+            if (req.isUserInRole("Admin"))
             {
                DelegateContext ctx = new DelegateContext();
 
@@ -444,20 +427,20 @@
 
                   Set roles = roleModule.findRoles();
                   Role[] rolesArray = new Role[roles.size()];
-                  rolesArray = (Role[]) roles.toArray(rolesArray);
+                  rolesArray = (Role[])roles.toArray(rolesArray);
                   Role role = null;
                   DelegateContext rowCtx = null;
-                  for(int i = 0; i < rolesArray.length; i++)
+                  for (int i = 0; i < rolesArray.length; i++)
                   {
                      int oddeven = i % 3;
                      role = rolesArray[i];
-                     if(oddeven == 0)
+                     if (oddeven == 0)
                      {
                         rowCtx = ctx.next("row");
                      }
 
                      DelegateContext colCtx = rowCtx.next("col");
-                     if(userRoles.contains(role))
+                     if (userRoles.contains(role))
                      {
                         colCtx.put("ischecked", "checked");
                      }
@@ -466,12 +449,12 @@
                      colCtx.put("displayname", role.getDisplayName());
                   }
                }
-               catch(IllegalArgumentException e)
+               catch (IllegalArgumentException e)
                {
                   // TODO Auto-generated catch block
                   e.printStackTrace();
                }
-               catch(IdentityException e)
+               catch (IdentityException e)
                {
                   // TODO Auto-generated catch block
                   e.printStackTrace();
@@ -482,9 +465,9 @@
                rd.include(req, resp);
             }
          }
-         else if(OP_SHOWREGISTER.equals(op))
+         else if (OP_SHOWREGISTER.equals(op))
          {
-            if(req.isUserInRole("Admin"))
+            if (req.isUserInRole("Admin"))
             {
                PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/registerUser.jsp");
                rd.include(req, resp);
@@ -499,7 +482,7 @@
       else
       {
          // User is not logged in
-         if(req.getWindowState() != WindowState.MAXIMIZED)
+         if (req.getWindowState() != WindowState.MAXIMIZED)
          {
             op = OP_SHOWLOGIN;
          }
@@ -508,19 +491,19 @@
             op = req.getParameters().get(getOperationName(), OP_SHOWLOGIN);
          }
 
-         if(OP_SHOWREGISTER.equals(op))
+         if (OP_SHOWREGISTER.equals(op))
          {
             PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register.jsp");
             rd.include(req, resp);
          }
 
-         else if(OP_SHOWLOGIN.equals(op))
+         else if (OP_SHOWLOGIN.equals(op))
          {
             PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
             PortalNode currentNode = Navigation.getCurrentNode();
             PortalNodeURL url = resp.createRenderURL(currentNode);
             url.setAuthenticated(Boolean.TRUE);
-            if("1".equals(getPortletConfig().getInitParameter("useSSL")))
+            if ("1".equals(getPortletConfig().getInitParameter("useSSL")))
             {
                url.setSecure(Boolean.TRUE);
                req.setAttribute("secureURL", url.toString());
@@ -544,7 +527,7 @@
     */
    public void showListUsers(JBossActionRequest actionRequest, JBossActionResponse actionResponse) throws IOException
    {
-      if(actionRequest.isUserInRole("Admin"))
+      if (actionRequest.isUserInRole("Admin"))
       {
          actionResponse.setRenderParameter("usernamefilter", actionRequest.getParameter("usernamefilter"));
          actionResponse.setRenderParameter("usersperpage", actionRequest.getParameter("usersperpage"));
@@ -553,13 +536,11 @@
    }
 
 
-   /**
-    * Performs a log out.
-    */
+   /** Performs a log out. */
    public void userLogout(JBossActionRequest req, JBossActionResponse resp) throws IOException
    {
       String locationURL = req.getParameter("locationURL");
-      if(locationURL != null)
+      if (locationURL != null)
       {
          resp.signOut(locationURL);
       }
@@ -580,7 +561,7 @@
       // TODO: Check that a bot is not creating many accounts
       String uname = req.getParameter("uname");
       int nbErrors = 0;
-      if((uname == null) || (uname.length() == 0))
+      if ((uname == null) || (uname.length() == 0))
       {
          nbErrors++;
          resp.setRenderParameter("uname_error", "REGISTER_ERROR_INVALIDUSERNAME");
@@ -590,43 +571,43 @@
          try
          {
             User user = userModule.findUserByUserName(uname);
-            if(user != null)
+            if (user != null)
             {
                nbErrors++;
                resp.setRenderParameter("uname_error", "REGISTER_ERROR_EXISTINGUSERNAME");
             }
          }
-         catch(IllegalArgumentException e)
+         catch (IllegalArgumentException e)
          {
             log.error("", e);
          }
-         catch(IdentityException e)
+         catch (IdentityException e)
          {
             // Ok the user does not exist yet
          }
       }
 
       String pass1 = req.getParameter("pass1");
-      if((pass1 == null) || (pass1.length() == 0))
+      if ((pass1 == null) || (pass1.length() == 0))
       {
          nbErrors++;
          resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1");
       }
 
       String pass2 = req.getParameter("pass2");
-      if((pass2 == null) || (pass2.length() == 0))
+      if ((pass2 == null) || (pass2.length() == 0))
       {
          nbErrors++;
          resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2");
       }
-      else if(!pass1.equals(pass2))
+      else if (!pass1.equals(pass2))
       {
          nbErrors++;
          resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH");
       }
 
       String realEmail = req.getParameter("realemail");
-      if(!URLTools.isEmailValid(realEmail))
+      if (!URLTools.isEmailValid(realEmail))
       {
          nbErrors++;
          resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL");
@@ -636,7 +617,7 @@
       String question = req.getParameter("question");
       String answer = req.getParameter("answer");
       User user = null;
-      if(nbErrors == 0)
+      if (nbErrors == 0)
       {
          try
          {
@@ -645,17 +626,17 @@
 
             //user.setRegistrationDate(new Date());
             String subscriptionMode = getPortletConfig().getInitParameter(UserPortletConstants.SUBSCRIPTIONMODE);
-            if(subscriptionMode == null)
+            if (subscriptionMode == null)
             {
                subscriptionMode = UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC;
             }
 
-            if(UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC.equals(subscriptionMode))
+            if (UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC.equals(subscriptionMode))
             {
                user.setEnabled(true);
             }
 
-            else if(UserPortletConstants.SUBSCRIPTIONMODE_EMAILVERIFICATION.equals(subscriptionMode))
+            else if (UserPortletConstants.SUBSCRIPTIONMODE_EMAILVERIFICATION.equals(subscriptionMode))
             {
                user.setEnabled(false);
                String emailText = generateValidationEmail(req, resp, user, pass1);
@@ -675,11 +656,11 @@
 
             // Add the user to the default user role
             String defaultRole = getPortletConfig().getInitParameter(UserPortletConstants.DEFAULT_ROLE);
-            if(defaultRole != null)
+            if (defaultRole != null)
             {
                Set roleSet = new HashSet();
                Role role = roleModule.findRoleByName(defaultRole);
-               if(role != null)
+               if (role != null)
                {
                   roleSet.add(role);
                   roleModule.setRoles(user, roleSet);
@@ -694,11 +675,11 @@
                log.info("You didn't specify a default role in the portlet init configuration, please refer to the documentation");
             }
          }
-         catch(IllegalArgumentException e)
+         catch (IllegalArgumentException e)
          {
             log.error("Cannot create user " + uname, e);
          }
-         catch(IdentityException e)
+         catch (IdentityException e)
          {
             log.error("Cannot create user " + uname, e);
          }
@@ -722,19 +703,19 @@
       ctx.put("FAKEEMAIL", user.getFakeEmail());
       ctx.put("THEME", user.getTheme());
       ctx.put("VIEWREALEMAIL", user.getViewRealEmail() ? "checked=\"checked\"" : "");
-      ctx.put("HOMEPAGE", (String) (user.getProperties().get(User.INFO_USER_HOMEPAGE)));
-      ctx.put("ICQ", (String) (user.getProperties().get(User.INFO_USER_IM_ICQ)));
-      ctx.put("AIM", (String) (user.getProperties().get(User.INFO_USER_IM_AIM)));
-      ctx.put("YIM", (String) (user.getProperties().get(User.INFO_USER_IM_YIM)));
-      ctx.put("MSNM", (String) (user.getProperties().get(User.INFO_USER_IM_MSNM)));
-      ctx.put("SKYPE", (String) (user.getProperties().get(User.INFO_USER_IM_SKYPE)));
-      ctx.put("SIGNATURE", (String) (user.getProperties().get(User.INFO_USER_SIGNATURE)));
-      ctx.put("LOCATION", (String) (user.getProperties().get(User.INFO_USER_LOCATION)));
-      ctx.put("OCCUPATION", (String) (user.getProperties().get(User.INFO_USER_OCCUPATION)));
-      ctx.put("INTERESTS", (String) (user.getProperties().get(User.INFO_USER_INTERESTS)));
-      ctx.put("EXTRA", (String) (user.getProperties().get(User.INFO_USER_EXTRA)));
-      ctx.put("QUESTION", (String) (user.getProperties().get(User.INFO_USER_SECURITY_QUESTION)));
-      ctx.put("ANSWER", (String) (user.getProperties().get(User.INFO_USER_SECURITY_ANSWER)));
+      ctx.put("HOMEPAGE", (String)(user.getProperties().get(User.INFO_USER_HOMEPAGE)));
+      ctx.put("ICQ", (String)(user.getProperties().get(User.INFO_USER_IM_ICQ)));
+      ctx.put("AIM", (String)(user.getProperties().get(User.INFO_USER_IM_AIM)));
+      ctx.put("YIM", (String)(user.getProperties().get(User.INFO_USER_IM_YIM)));
+      ctx.put("MSNM", (String)(user.getProperties().get(User.INFO_USER_IM_MSNM)));
+      ctx.put("SKYPE", (String)(user.getProperties().get(User.INFO_USER_IM_SKYPE)));
+      ctx.put("SIGNATURE", (String)(user.getProperties().get(User.INFO_USER_SIGNATURE)));
+      ctx.put("LOCATION", (String)(user.getProperties().get(User.INFO_USER_LOCATION)));
+      ctx.put("OCCUPATION", (String)(user.getProperties().get(User.INFO_USER_OCCUPATION)));
+      ctx.put("INTERESTS", (String)(user.getProperties().get(User.INFO_USER_INTERESTS)));
+      ctx.put("EXTRA", (String)(user.getProperties().get(User.INFO_USER_EXTRA)));
+      ctx.put("QUESTION", (String)(user.getProperties().get(User.INFO_USER_SECURITY_QUESTION)));
+      ctx.put("ANSWER", (String)(user.getProperties().get(User.INFO_USER_SECURITY_ANSWER)));
    }
 
    /**
@@ -746,7 +727,7 @@
    public void storeProfile(JBossActionRequest req, JBossActionResponse resp) throws PortletException
    {
       User currentUser = req.getUser();
-      if(currentUser == null)
+      if (currentUser == null)
       {
          throw new PortletException("No user");
       }
@@ -758,14 +739,14 @@
          String userid = req.getParameters().getParameter("userid");
          user = userModule.findUserById(userid);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          throw new PortletException("blah", e);
       }
 
       // Are we editing ourself ?
       boolean self = currentUser.getId().equals(user.getId());
-      if(!self && !req.isUserInRole("Admin"))
+      if (!self && !req.isUserInRole("Admin"))
       {
          throw new PortletException();
       }
@@ -777,21 +758,21 @@
       String familyName = req.getParameter("familyname");
       String pass1 = req.getParameter("pass1");
       String pass2 = req.getParameter("pass2");
-      if(!(((pass2 == null) || (pass2.length() == 0)) && ((pass1 == null) || (pass1.length() == 0))))
+      if (!(((pass2 == null) || (pass2.length() == 0)) && ((pass1 == null) || (pass1.length() == 0))))
       {
          changePassword = true;
-         if((pass1 == null) || (pass1.length() == 0))
+         if ((pass1 == null) || (pass1.length() == 0))
          {
             nbErrors++;
             resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1");
          }
 
-         if((pass2 == null) || (pass2.length() == 0))
+         if ((pass2 == null) || (pass2.length() == 0))
          {
             nbErrors++;
             resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2");
          }
-         else if(!pass1.equals(pass2))
+         else if (!pass1.equals(pass2))
          {
             nbErrors++;
             resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH");
@@ -799,7 +780,7 @@
       }
 
       String realEmail = req.getParameter("realemail");
-      if(!URLTools.isEmailValid(realEmail))
+      if (!URLTools.isEmailValid(realEmail))
       {
          nbErrors++;
          resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL");
@@ -824,42 +805,42 @@
       String locale = req.getParameter("locale");
       String theme = req.getParameter("theme");
 
-      if(nbErrors == 0)
+      if (nbErrors == 0)
       {
          //
-         if(givenName.trim().length() != 0)
+         if (givenName.trim().length() != 0)
          {
             user.setGivenName(givenName);
          }
 
-         if(familyName.trim().length() != 0)
+         if (familyName.trim().length() != 0)
          {
             user.setFamilyName(familyName);
          }
 
-         if(realEmail.trim().length() != 0)
+         if (realEmail.trim().length() != 0)
          {
             user.setRealEmail(realEmail);
          }
 
-         if(fakeEmail.trim().length() != 0)
+         if (fakeEmail.trim().length() != 0)
          {
             user.setFakeEmail(fakeEmail);
          }
 
          user.setViewRealEmail(viewRealEmail);
-         if(changePassword)
+         if (changePassword)
          {
             user.updatePassword(pass1);
          }
 
-         if(timezoneoffset.shortValue() != UNDEFINED_TIMEZONE)
+         if (timezoneoffset.shortValue() != UNDEFINED_TIMEZONE)
          {
             user.getProperties().put(User.INFO_USER_TIME_ZONE_OFFSET, timezoneoffset.toString());
          }
 
          LocaleInfo localeInfo = LocaleInfo.decodeLocaleInfo(locale);
-         if(localeInfo != null)
+         if (localeInfo != null)
          {
             user.setPreferredLocale(localeInfo.getLocale());
          }
@@ -889,7 +870,7 @@
          portletHelper.setRenderParameter(resp, "FAMILYNAME", familyName);
          portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail);
          portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail);
-         if(user.getViewRealEmail())
+         if (user.getViewRealEmail())
          {
             portletHelper.setRenderParameter(resp, "VIEWREALEMAIL", "checked=\"checked\"");
          }
@@ -924,7 +905,7 @@
     */
    public void addRolesToUser(JBossActionRequest request, JBossActionResponse response)
    {
-      if(request.isUserInRole("Admin"))
+      if (request.isUserInRole("Admin"))
       {
          String[] selectedRoles = request.getParameterValues("roles");
          String userId = request.getParameters().getParameter("userid");
@@ -934,12 +915,12 @@
             Set roles = roleModule.findRolesByNames(selectedRoles);
             roleModule.setRoles(user, roles);
          }
-         catch(IllegalArgumentException e)
+         catch (IllegalArgumentException e)
          {
             // TODO Auto-generated catch block
             e.printStackTrace();
          }
-         catch(IdentityException e)
+         catch (IdentityException e)
          {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -997,7 +978,7 @@
          sb.append("\n\n");
          sb.append(bundle.getString("VALIDATIONEMAIL_5") + "\n");
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          log.error("Cannot generate an email notification", e);
       }
@@ -1022,7 +1003,7 @@
       {
          user = userModule.findUserById(userId);
          String hexCompare = Tools.md5AsHexString(user.getUserName() + user.getRegistrationDate() + UserPortletConstants.SALT);
-         if(hash.equals(hexCompare))
+         if (hash.equals(hexCompare))
          {
             user.setEnabled(true);
             portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.INFOMESSAGE, "INFOMESSAGE_CONGRATULATIONACTIVATED");
@@ -1032,7 +1013,7 @@
             portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.ERRORMESSAGE, "ERRORMESSAGE_UNABLEACTIVATE");
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.ERRORMESSAGE, "ERRORMESSAGE_UNABLEACTIVATE");
       }
@@ -1041,9 +1022,9 @@
    private String getFullName(ResourceBundle bundle,
                               User user)
    {
-      if((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0))
+      if ((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0))
       {
-         if((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
+         if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
          {
             return user.getGivenName() + " " + user.getFamilyName();
          }
@@ -1054,7 +1035,7 @@
       }
       else
       {
-         if((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
+         if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
          {
             return user.getFamilyName().trim();
          }
@@ -1067,7 +1048,7 @@
 
    private void putNonEmptyProperty(User user, String key, String value)
    {
-      if((value != null) && (value.trim().length() != 0))
+      if ((value != null) && (value.trim().length() != 0))
       {
          user.getProperties().put(key, value);
       }
@@ -1075,14 +1056,14 @@
 
    public void deleteUser(JBossActionRequest request, JBossActionResponse response)
    {
-      if(request.isUserInRole("Admin"))
+      if (request.isUserInRole("Admin"))
       {
          try
          {
             User user = userModule.findUserById(request.getParameter("userid"));
             userModule.removeUser(user.getId());
          }
-         catch(IdentityException e)
+         catch (IdentityException e)
          {
             e.printStackTrace();
          }

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.context.Context;
+import org.jboss.portal.common.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.common.context.Context;
-import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.context.Context;
+import org.jboss.portal.common.context.NamedContext;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.Iterator;
+import java.util.LinkedList;
 
-import org.jboss.portal.common.context.Context;
-import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.context.Context;
+import org.jboss.portal.common.context.NamedContext;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.LinkedList;
 
-import org.jboss.portal.common.context.Context;
-import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.context.Context;
+import org.jboss.portal.common.context.NamedContext;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.Iterator;
+import java.util.LinkedList;
 
-import org.jboss.portal.common.context.Context;
-import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.context.Context;
+import org.jboss.portal.common.context.NamedContext;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+
+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.common.context.Context;
-import org.jboss.portal.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.system;
 
 import org.jboss.portal.common.system.AbstractJBossService;
 
-import javax.management.ObjectName;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
+import javax.management.ObjectName;
 import javax.management.ReflectionException;
 
 /**

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/ProxyValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/ProxyValidator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/ProxyValidator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/RewriteHelper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/RewriteHelper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/util/RewriteHelper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,58 +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.core;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-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.common.context.Context;
 import org.jboss.portal.common.context.DelegateContext;
 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 org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+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;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/** @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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-
 import org.apache.cactus.ServletTestCase;
 import org.apache.cactus.WebResponse;
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 
-/**
- * @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 IterateTagTestCase
-      extends ServletTestCase
-      
-      
+   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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/MapperTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/MapperTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/MapperTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/OutELTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/OutELTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.cactus.JspTestCase;
 import org.jboss.portal.common.context.Context;
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PageTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PageTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PageTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.context.DelegateContext;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 
-/**
- * @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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/Utils.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/Utils.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/Utils.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,64 +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.test.core;
 
+import org.dbunit.database.DatabaseConnection;
+import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.xml.FlatXmlDataSet;
+
 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;
-
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class Utils
 {
 
    private static String url = "jdbc:mysql://localhost:3306/jbossportal?useServerPrepStmts=false";
    private static String username = "portal";
    private static String password = "portalpassword";
-   
+
    public static IDataSet getDataSet(String file) throws Exception
    {
-       return new FlatXmlDataSet(new FileInputStream(file));
+      return new FlatXmlDataSet(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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,57 +29,53 @@
  */
 package org.jboss.portal.test.core.model.instance;
 
-import junit.framework.TestSuite;
 import junit.framework.TestCase;
+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.hibernate.Session;
-import org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.core.impl.model.instance.InstanceImpl;
+import org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer;
 import org.jboss.portal.core.impl.model.instance.UserInstance;
-import org.jboss.portal.core.impl.portlet.state.PersistentStateStore;
-import org.jboss.portal.core.impl.portlet.state.PersistentStateEntry;
 import org.jboss.portal.core.impl.portlet.state.PersistentState;
+import org.jboss.portal.core.impl.portlet.state.PersistentStateEntry;
+import org.jboss.portal.core.impl.portlet.state.PersistentStateStore;
 import org.jboss.portal.core.model.instance.Instance;
-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.state.producer.StatefulPortletInvoker;
-import org.jboss.portal.portlet.state.AbstractPropertyContext;
-import org.jboss.portal.portlet.state.PropertyChange;
-import org.jboss.portal.Mode;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.state.AbstractPropertyContext;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.producer.StatefulPortletInvoker;
+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.test.framework.junit.DatabaseTestSuite;
 import org.jboss.portal.test.framework.junit.TransactionAssert;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.common.value.SimpleValueMap;
-import org.jboss.portal.common.value.StringValue;
-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 javax.transaction.UserTransaction;
 import javax.transaction.Status;
+import javax.transaction.UserTransaction;
 import java.net.URL;
 import java.util.List;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
 /**
- * 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 : test InstanceContainer with cloneOnCreate=true 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 : test InstanceContainer with cloneOnCreate=true
- * 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$
@@ -262,9 +281,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * Runtime clone of a producer offered portlet.
-    */
+   /** Runtime clone of a producer offered portlet. */
    public void testCloneBeforeWrite() throws Exception
    {
       nextPortletInvoker.addPortlet(new PortletSupport("MyPortlet")
@@ -273,6 +290,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("_abc", new StringValue("_def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -328,9 +346,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * Runtime clone of a producer offered portlet.
-    */
+   /** Runtime clone of a producer offered portlet. */
    public void testCloneBeforeWriteRollback() throws Exception
    {
       nextPortletInvoker.addPortlet(new PortletSupport("MyPortlet")
@@ -339,6 +355,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("_abc", new StringValue("_def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -383,6 +400,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("_abc", new StringValue("_def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -434,6 +452,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("_abc", new StringValue("_def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -494,26 +513,6 @@
       TransactionAssert.commitTransaction();
    }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //   /**Tests the authorization of portal objects */
 //   public void _testInstanceAuthorization() throws Exception
 //   {
@@ -565,7 +564,6 @@
 //   }
 //
 
-
 //
 //
 //   /**

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/SimpleActionContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/SimpleActionContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/SimpleActionContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.core.model.instance;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.portlet.support.spi.ActionContextSupport;
-import org.jboss.portal.Mode;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

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

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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.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.security.SimplePrincipal;
 
+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>
@@ -93,6 +94,7 @@
          {
             return "portalobject";
          }
+
          public PermissionFactory getPermissionFactory()
          {
             return new PermissionFactory()
@@ -101,10 +103,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/SimpleInstanceContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/SimpleInstanceContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/SimpleInstanceContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.core.state;
 
+import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.support.spi.InstanceContextSupport;
-import org.jboss.portal.portlet.state.AccessMode;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/StatefulPortletInvokerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/StatefulPortletInvokerTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/state/StatefulPortletInvokerTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.core.state;
 
 import junit.framework.TestCase;
 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.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.test.framework.junit.DatabaseTestSuite;
-import org.jboss.portal.test.framework.junit.TransactionAssert;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.test.core.model.instance.SimpleActionContext;
-import org.jboss.portal.test.core.model.instance.SimpleUserContext;
-import org.jboss.portal.portlet.test.ValueMapAssert;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.value.ValueMap;
 import org.jboss.portal.core.impl.portlet.state.PersistentStateStore;
 import org.jboss.portal.core.impl.portlet.state.StatefulPortletInvoker;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.Portlet;
-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.state.producer.State;
 import org.jboss.portal.portlet.state.AbstractPropertyContext;
+import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.state.PropertyChange;
-import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.test.support.info.PreferencesInfoSupport;
+import org.jboss.portal.portlet.state.producer.State;
+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.common.value.ValueMap;
-import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.portlet.test.support.info.PreferencesInfoSupport;
+import org.jboss.portal.test.core.model.instance.SimpleActionContext;
+import org.jboss.portal.test.core.model.instance.SimpleUserContext;
+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.junit.DatabaseTestSuite;
+import org.jboss.portal.test.framework.junit.TransactionAssert;
 
 import java.net.URL;
 
@@ -156,6 +157,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -169,6 +171,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -182,6 +185,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             try
@@ -202,6 +206,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public void invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -575,9 +580,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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossAPIFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossAPIFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossAPIFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.Navigation;
 import org.jboss.portal.core.command.portlet.CoreUserContext;
-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 CoreUserContext)

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossActionResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.JBossPortalNode;
 import org.jboss.portal.core.api.PortalNodeURLFactory;
 import org.jboss.portal.core.output.SignOutResult;
-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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortletPreferences.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortletPreferences.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossPortletPreferences.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet;
 
-import java.util.Map;
-
-import javax.portlet.PortletPreferences;
-
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.core.api.Navigation;
 import org.jboss.portal.core.command.portlet.CoreUserContext;
-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.theme.PortalTheme;
 import org.jboss.portal.theme.ThemeConstants;
-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. */
@@ -64,17 +64,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 CoreUserContext)

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/JBossRenderResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.node.PortalNode;
+import org.jboss.portal.api.node.PortalNodeURL;
+import org.jboss.portal.core.api.JBossPortalNode;
+import org.jboss.portal.core.api.PortalNodeURLFactory;
 import org.jboss.portal.portlet.impl.jsr168.PortletRequestImpl;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.impl.jsr168.RenderResponseImpl;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.core.api.PortalNodeURLFactory;
-import org.jboss.portal.core.api.JBossPortalNode;
-import org.jboss.portal.api.node.PortalNodeURL;
-import org.jboss.portal.api.node.PortalNode;
+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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/command/ActionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/command/ActionCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/command/ActionCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software 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.command;
 
 import org.jboss.portal.common.command.Command;

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/session/PortletSessionListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/session/PortletSessionListener.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/session/PortletSessionListener.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software 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: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/util/Parameters.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/util/Parameters.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portlet/util/Parameters.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-app_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-app_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-app_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-portlet_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-portlet_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/jboss-portlet_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-layouts_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-layouts_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-layouts_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-renderSet_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-renderSet_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-renderSet_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-strategies_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-strategies_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-strategies_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-themes_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-themes_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal-themes_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portal_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portlet-instances_2_0.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portlet-instances_2_0.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/dtd/portlet-instances_2_0.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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"
@@ -77,7 +100,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"/>-->
 
@@ -105,7 +128,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">
@@ -124,7 +147,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>
@@ -175,7 +198,7 @@
 
    @portal.single.xml.open@
    -->
-  
+
    <mbean
       code="org.jboss.portal.core.cms.CMSObjectCommandFactory"
       name="portal:commandFactory=CMSObject"
@@ -209,153 +232,152 @@
       <attribute name="Prefix">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>
@@ -369,18 +391,18 @@
                    </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>
 </server>

Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-cms-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 -->

Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/data/default-object.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/data/default-object.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.InstanceImpl"
-         table="JBP_INSTANCE">
+      name="org.jboss.portal.core.impl.model.instance.InstanceImpl"
+      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="userInstances"
-            inverse="true"
-            cascade="save-update"
-            fetch="select"
-            lazy="extra">
+         name="userInstances"
+         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.UserInstance"/>
@@ -60,76 +83,76 @@
    </class>
 
    <class
-         name="org.jboss.portal.core.impl.model.instance.UserInstance"
-         table="JBP_INSTANCE_PER_USER">
+      name="org.jboss.portal.core.impl.model.instance.UserInstance"
+      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="instance"
-            column="INSTANCE_PK"
-            class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
-            cascade="none"
-            fetch="select"/>
+         name="instance"
+         column="INSTANCE_PK"
+         class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
+         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="userId"
-               column="USER_ID"
-               not-null="true"
-               length="170"/>
+            name="userId"
+            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.InstanceImpl"
-            cascade="none"
-            fetch="select"/>
+         name="instance"
+         column="INSTANCE_PK"
+         class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
+         cascade="none"
+         fetch="select"/>
    </class>
 </hibernate-mapping> 

Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/login-config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/login-config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/portal-aop.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/portal-aop.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-sar/portal-aop.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/prefs/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/prefs/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/prefs/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/faces-config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/faces-config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/default-object.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/default-object.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-server-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/setup/portal-ds.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/setup/portal-ds.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/setup/portal-ds.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/domain.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/domain.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/domain.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/local.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/local.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/local.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/replicated.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/replicated.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/cache/replicated.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarole.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarole.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarole.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarolecreated.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarolecreated.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/datarolecreated.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroledeleted.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroledeleted.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroledeleted.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroleedited.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroleedited.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/dataroleedited.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/core/src/resources/test/theme.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/test/theme.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/test/theme.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/TypeDef.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/TypeDef.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/el/TypeDef.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Cell.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Cell.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Cell.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Row.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Row.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/Row.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-lib-jar/composite.tld
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-lib-jar/composite.tld	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-lib-jar/composite.tld	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/faces/src/resources/portal-faces-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/federation/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/federation/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/federation/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -29,9 +30,9 @@
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.spi.InstanceContext;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
 
 import java.util.Iterator;
 import java.util.LinkedHashSet;

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

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

Modified: branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/AbstractParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/AbstractParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/AbstractParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/TextEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/TextEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/TextEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/Token.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/Token.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/Token.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Chars.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Chars.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Chars.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Filter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Filter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/Filter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/html/TagParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/html/TagParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/html/TagParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/AbstractContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/AbstractContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/AbstractContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/BuildException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/BuildException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/BuildException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Context.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Context.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Context.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/DelegateContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/DelegateContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/DelegateContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Template.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Template.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/Template.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateLoader.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateLoader.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateLoader.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateRepository.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateRepository.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateRepository.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateUtils.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateUtils.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/template/TemplateUtils.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/CLLoader.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/CLLoader.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/CLLoader.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/EntityTable.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/EntityTable.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/EntityTable.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Loader.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Loader.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Loader.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Stack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Stack.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/format/util/Stack.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,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="jboss.microcontainer.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
@@ -130,28 +153,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">
 	       <jar jarfile="${build.lib}/portal-identity-test-lib.jar">
 	           <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
 	           <fileset dir="${build.resources}/portal-identity-test-jar"/>
@@ -190,7 +215,7 @@
    <target name="tests" depends="init">
       <execute-tests>
          <x-test>
-            <test todir="${test.reports}"  name="org.jboss.portal.test.identity.UserTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.identity.UserTestCase"/>
          </x-test>
          <x-classpath>
             <pathelement location="${build.lib}/portal-identity-lib.jar"/>

Modified: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/IdentityException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/IdentityException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/IdentityException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/PropertyMap.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/PropertyMap.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/PropertyMap.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/Role.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/Role.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/Role.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/RoleModule.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/RoleModule.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/RoleModule.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/User.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/User.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/User.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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. */
    PropertyMap getProperties();
 
    // 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/UserModule.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/UserModule.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/UserModule.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portal.identity.UserModule;
+import org.jboss.security.SimpleGroup;
 import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
-import org.jboss.security.SimpleGroup;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.CallbackHandler;
-import javax.naming.NamingException;
-import javax.naming.InitialContext;
 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;

Modified: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/PropertyMapImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/PropertyMapImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/PropertyMapImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.PropertyMap;
 
-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.
@@ -84,7 +85,7 @@
 
    public boolean containsValue(Object value1)
    {
-      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);
@@ -112,11 +113,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
@@ -169,9 +170,7 @@
       return user.getDynamic().remove(key);
    }
 
-   /**
-    * Clear only dynamic properties.
-    */
+   /** Clear only dynamic properties. */
    public void clear()
    {
       user.getDynamic().clear();
@@ -191,7 +190,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));
@@ -200,13 +199,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));
@@ -217,7 +214,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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.PropertyMap;
-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.PropertyMap;
+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.
@@ -77,31 +78,23 @@
       return Collections.unmodifiableMap(map);
    }
 
-   /**
-    * Non mapped.
-    */
+   /** Non mapped. */
    protected Long key;
    protected boolean enabled;
    protected String password;
 
-   /**
-    * P3P mapped.
-    */
+   /** P3P mapped. */
    protected String userName;
    protected String givenName;
    protected String familyName;
    protected String realEmail;
 
-   /**
-    * Extension mapped.
-    */
+   /** Extension mapped. */
    protected String fakeEmail;
    protected boolean viewRealEmail;
    protected Date registrationDate;
 
-   /**
-    * Other fields.
-    */
+   /** Other fields. */
    protected Map dynamic;
    protected PropertyMap properties;
    protected Set roleNames;
@@ -135,41 +128,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;
@@ -322,17 +305,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;
@@ -341,9 +320,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;
@@ -378,9 +355,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);
@@ -391,9 +366,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;
@@ -449,9 +422,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)
@@ -474,9 +445,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
    {
 
@@ -517,7 +486,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
@@ -595,10 +564,12 @@
       {
          super(propertyName, fieldName, writable, nullable);
       }
+
       protected Object toObject(String value)
       {
          return value;
       }
+
       protected String toString(Object value)
       {
          return (String)value;
@@ -611,6 +582,7 @@
       {
          super(propertyName, fieldName, writable, nullable);
       }
+
       protected Object toObject(String value) throws IllegalArgumentException
       {
          if ("true".equalsIgnoreCase(value))
@@ -626,6 +598,7 @@
             throw new IllegalArgumentException("The value " + value + " cannot be converted to boolean for accessor " + toString());
          }
       }
+
       protected String toString(Object value)
       {
          return value.toString();
@@ -641,10 +614,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
@@ -658,6 +633,7 @@
             throw new IllegalArgumentException();
          }
       }
+
       protected String toString(Object value)
       {
          Date date = (Date)value;

Modified: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.User;
 import org.jboss.portal.identity.UserModule;
 
+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 UserModuleImpl()
@@ -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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.identity;
 
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
-import org.jboss.portal.test.framework.embedded.HibernateSupport;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.identity.db.UserModuleImpl;
-import org.jboss.portal.identity.db.RoleModuleImpl;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.PropertyMap;
-import org.jboss.portal.common.p3p.P3PConstants;
+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.apache.log4j.Logger;
-import org.apache.log4j.Level;
+import org.jboss.portal.common.p3p.P3PConstants;
+import org.jboss.portal.identity.PropertyMap;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.db.RoleModuleImpl;
+import org.jboss.portal.identity.db.UserModuleImpl;
+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.junit.DatabaseTestSuite;
 
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.net.URL;
 
-import junit.framework.TestSuite;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/identity/src/resources/hibernate/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/resources/hibernate/domain.hbm.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/resources/hibernate/domain.hbm.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -249,7 +250,7 @@
          int check = doCheck();
          switch (check)
          {
-            case RESULT_NONE :
+            case RESULT_NONE:
                break;
             case RESULT_UPDATE:
                updateSchema();

Modified: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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">
@@ -174,9 +197,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>
 
@@ -250,9 +273,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>
 
@@ -418,39 +441,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>
@@ -547,8 +600,10 @@
             <!--<test todir="${test.reports}" name="org.jboss.portal.test.portlet.deployment.UnmarshallerTestCase"/>-->
             <!--<test todir="${test.reports}" name="org.jboss.portal.test.portlet.PortletRequestDecoderTestCase"/>-->
             <!--<test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.StatefulPortletInvokerTestCase"/>-->
-            <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.dispatcher.DispatcherTestSuite"/>
+            <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.dispatcher.DispatcherTestSuite"/>
          </x-test>
          <x-classpath>
             <path refid="oswego.concurrent.classpath"/>
@@ -569,7 +624,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ActionURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ActionURL.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ActionURL.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Parameters.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Parameters.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Parameters.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
 
 /**
@@ -173,9 +174,8 @@
    }
 
    /**
-    * Append the parameters to this object. All the entries will be inserted
-    * in the current map. If a collision occurs then the new values will be
-    * appended to the existing ones.
+    * Append the parameters to this object. All the entries will be inserted in the current map. If a collision occurs
+    * then the new values will be appended to the existing ones.
     *
     * @param params
     * @throws IllegalArgumentException if the params is null
@@ -199,12 +199,10 @@
       internalAppend(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();
@@ -254,9 +252,7 @@
       internalReplace(params.map);
    }
 
-   /**
-    * Replace actual implementation.
-    */
+   /** Replace actual implementation. */
    private void internalReplace(Map params)
    {
       map.clear();
@@ -269,9 +265,7 @@
       }
    }
 
-   /**
-    * Compare to parameters objects.
-    */
+   /** Compare to parameters objects. */
    public boolean equals(Object o)
    {
       if (o == this)

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Portlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Portlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Portlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -31,21 +32,17 @@
  */
 public interface Portlet
 {
-   /**
-    * Return the portlet identifier.
-    */
+   /** Return the portlet identifier. */
    String getId();
 
-   /**
-    * Return the portlet info.
-    */
+   /** Return the portlet info. */
    PortletInfo getInfo();
 
    /**
     * 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.value.ValueMap;
@@ -63,7 +64,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
     */
    String createClone(String portletId) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -72,7 +73,7 @@
     * Destroy a cloned portlet.
     *
     * @param portletId 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
     */
    void destroyClone(String portletId) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -82,7 +83,7 @@
     *
     * @param portletId the portlet id
     * @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
     */
    ValueMap getProperties(String portletId) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -92,7 +93,7 @@
     *
     * @param portletId  the portlet id
     * @param properties the new properties
-    * @throws IllegalArgumentException if the portletId or the properties is null
+    * @throws IllegalArgumentException      if the portletId or the properties is null
     * @throws UnsupportedOperationException if the invoker does not support this operation
     */
    void setProperties(String portletId, ValueMap properties) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.server.request.RequestParameter;
-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$
@@ -158,7 +159,7 @@
          }
          else
          {
-            windowState =  null;
+            windowState = null;
          }
 
          //

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletURL.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/PortletURL.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Properties.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Properties.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/Properties.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/RenderURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/RenderURL.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/RenderURL.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/StateString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/StateString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/StateString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.aspects.portlet;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.StateString;
+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.result.Result;
 import org.jboss.portal.portlet.result.FragmentResult;
-import org.jboss.portal.portlet.result.cache.TimedContent;
+import org.jboss.portal.portlet.result.Result;
 import org.jboss.portal.portlet.result.cache.StrongTimedContent;
+import org.jboss.portal.portlet.result.cache.TimedContent;
 import org.jboss.portal.portlet.spi.InvocationContext;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.Mode;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.WindowState;
 
 import java.io.Serializable;
 
@@ -55,7 +56,7 @@
          invocationCtx.setAttribute(InvocationContext.PRINCIPAL_SCOPE, scopeKey, null);
 
          // Invoke
-        invocation.invokeNext();
+         invocation.invokeNext();
       }
       else if (invocation instanceof RenderInvocation)
       {
@@ -128,9 +129,7 @@
       }
    }
 
-   /**
-    * Encapsulate cache information.
-    */
+   /** Encapsulate cache information. */
    public static class CacheEntry implements Serializable
    {
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.aspects.portlet;
 
 import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.util.Exceptions;
+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.spi.RequestContext;
-import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.server.servlet.CommandServlet;
 import org.jboss.portal.server.servlet.ServletCommand;
 
@@ -94,7 +94,7 @@
          if (t instanceof Error)
          {
             // Rethrow any error
-            throw (Error)t;
+            throw(Error)t;
          }
          else if (t == null)
          {

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.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.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
-import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.invocation.PortletInterceptor;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 
 /**
- * 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -59,9 +60,7 @@
       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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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.portlet.session.SubSession;
 import org.jboss.portal.portlet.spi.InvocationContext;
-import org.jboss.portal.portlet.session.SubSession;
-import org.jboss.portal.common.invocation.InvocationException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 java.util.List;
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.result.FragmentResult;
 import org.jboss.portal.portlet.result.Result;
-import org.jboss.portal.portlet.result.FragmentResult;
-import org.jboss.portal.common.invocation.InvocationException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.result.InsufficientTransportGuaranteeResult;
 import org.jboss.portal.portlet.spi.SecurityContext;
-import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.result.InsufficientTransportGuaranteeResult;
-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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.result.Result;
 import org.jboss.portal.portlet.result.UnavailableResult;
-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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -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 @@
       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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.container;
 
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
-import org.jboss.portal.portlet.container.PortletApplicationImpl;
-import org.jboss.portal.portlet.container.PortletApplicationContext;
-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.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.KernelControllerContextAware;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
+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 javax.servlet.ServletContext;
 
@@ -144,11 +142,11 @@
       {
          if (throwable instanceof Exception)
          {
-            throw (Exception)throwable;
+            throw(Exception)throwable;
          }
          else if (throwable instanceof Error)
          {
-            throw (Error)throwable;
+            throw(Error)throwable;
          }
          else
          {

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.container;
 
 import org.jboss.portal.common.system.AbstractJBossService;
-import org.jboss.portal.portlet.impl.jsr168.PortletContextImpl;
 import org.jboss.portal.portlet.impl.jsr168.APIFactory;
+import org.jboss.portal.portlet.impl.jsr168.PortletContextImpl;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
-import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 
 import javax.portlet.PortletContext;
 import java.util.HashSet;
@@ -36,7 +35,6 @@
 import java.util.Set;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,68 +1,69 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.apache.log4j.Logger;
 import org.jboss.portal.common.concurrent.Valve;
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
+import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.container.info.ContentTypes;
+import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
+import org.jboss.portal.portlet.impl.jsr168.APIConstants;
+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.PortletConfigImpl;
 import org.jboss.portal.portlet.impl.jsr168.RenderRequestImpl;
 import org.jboss.portal.portlet.impl.jsr168.RenderResponseImpl;
-import org.jboss.portal.portlet.impl.jsr168.APIConstants;
-import org.jboss.portal.portlet.impl.jsr168.APIFactory;
-import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
-import org.jboss.portal.portlet.container.info.ContentTypes;
-import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletPreferencesMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData;
-import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
+import org.jboss.portal.portlet.info.PortletInfo;
 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.impl.jsr168.metadata.ParameterMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletPreferencesMetaData;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 import org.jboss.portal.portlet.result.ErrorResult;
 import org.jboss.portal.portlet.result.Result;
 import org.jboss.portal.portlet.result.SecurityErrorResult;
 import org.jboss.portal.portlet.result.UnavailableResult;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
 
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;
-import javax.portlet.UnavailableException;
 import javax.portlet.PreferencesValidator;
+import javax.portlet.UnavailableException;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -114,8 +115,8 @@
    protected PortletInfo info;
 
    /**
-    * The preference validator, this is not exposed as runtime meta data as it is only used
-    * by the JSR 168 portlet container implementation.
+    * The preference validator, this is not exposed as runtime meta data as it is only used by the JSR 168 portlet
+    * container implementation.
     */
    protected PreferencesValidator preferencesValidator;
 
@@ -374,9 +375,7 @@
       return "[PortletContainer=" + getId() + "]";
    }
 
-   /**
-    * Initialize the portlet.
-    */
+   /** Initialize the portlet. */
    private void initPortlet(Portlet portlet, PortletConfig config) throws PortletException
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
@@ -393,9 +392,7 @@
       }
    }
 
-   /**
-    * Destroy the portlet.
-    */
+   /** Destroy the portlet. */
    private void destroyPortlet(Portlet portlet)
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.container;
 
+import org.jboss.portal.common.invocation.InterceptorStack;
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.system.AbstractJBossService;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.InterceptorStack;
-import org.jboss.portal.common.value.ValueMap;
 import org.jboss.portal.common.value.SimpleValueMap;
 import org.jboss.portal.common.value.Value;
+import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.container.info.ContainerPreferenceInfo;
 import org.jboss.portal.portlet.container.info.ContainerPreferencesInfo;
-import org.jboss.portal.portlet.container.info.ContainerPreferenceInfo;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 
-import java.util.Set;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * An implementation of portlet invoker that makes a call to a portlet container.
@@ -117,11 +118,11 @@
       {
          if (e instanceof PortletInvokerException)
          {
-            throw (PortletInvokerException)e;
+            throw(PortletInvokerException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.container.info;
 
 import org.apache.log4j.Logger;
+import org.jboss.portal.common.util.EmptyResourceBundle;
+import org.jboss.portal.common.util.ParentChildResourceBundle;
 import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
-import org.jboss.portal.common.util.ParentChildResourceBundle;
-import org.jboss.portal.common.util.EmptyResourceBundle;
 
-import java.util.ResourceBundle;
+import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Locale;
-import java.util.HashMap;
 import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * Manage resource bundles for a portlet.
@@ -83,11 +84,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.impl.jsr168;
 
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.spi.ActionContext;
+
+import javax.portlet.ActionRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
-import javax.portlet.ActionRequest;
-
-import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.portlet.spi.ActionContext;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.Parameters;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -290,7 +290,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();
@@ -300,7 +300,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();
@@ -334,7 +334,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))
@@ -381,16 +381,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.impl.jsr168;
 
 import org.apache.log4j.Logger;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.portlet.container.PortletApplicationImpl;
-import org.jboss.portal.portlet.state.PropertyContext;
 import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
 import org.jboss.portal.portlet.container.info.ContentTypes;
-import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
 import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.spi.RequestContext;
 import org.jboss.portal.portlet.spi.SecurityContext;
 import org.jboss.portal.portlet.spi.UserContext;
-import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.state.PropertyContext;
 
 import javax.portlet.PortalContext;
 import javax.portlet.PortletMode;
@@ -50,16 +51,15 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
-import java.util.HashSet;
-import java.util.Iterator;
 
 /**
- * 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+
 import javax.portlet.PortletResponse;
 
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.impl.jsr168;
 
-import java.util.Map;
+import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.ActionURL;
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.spi.InvocationContext;
 
 import javax.portlet.PortletMode;
 import javax.portlet.PortletModeException;
+import javax.portlet.PortletRequest;
 import javax.portlet.PortletSecurityException;
 import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
+import java.util.Map;
 
-import org.jboss.portal.portlet.ActionURL;
-import org.jboss.portal.portlet.RenderURL;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.Parameters;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.spi.InvocationContext;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.Mode;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -91,9 +91,7 @@
       }
    }
 
-   /**
-    * @exception IllegalArgumentException if the name is null
-    */
+   /** @throws IllegalArgumentException if the name is null */
    public void setParameter(String name, String value)
    {
       if (value == null)
@@ -133,17 +131,13 @@
       return s;
    }
 
-   /**
-    * Creates an action URL.
-    */
+   /** Creates an action URL. */
    public static PortletURL createActionURL(PortletInvocation invocation, PortletRequest preq)
    {
       return new PortletURLImpl(invocation, preq, new InternalActionURL());
    }
 
-   /**
-    * Creates an render URL.
-    */
+   /** Creates an render URL. */
    public static PortletURL createRenderURL(PortletInvocation invocation, PortletRequest preq)
    {
       return new PortletURLImpl(invocation, preq, new InternalRenderURL());
@@ -249,9 +243,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
 import org.jboss.portal.portlet.spi.RenderContext;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.StateString;
 
 import javax.portlet.RenderRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.impl.jsr168;
 
+import org.jboss.portal.common.MediaType;
+import org.jboss.portal.portlet.Properties;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.result.FragmentResult;
+import org.jboss.portal.portlet.result.Result;
+import org.jboss.portal.server.util.HTTPStreamInfo;
+
+import javax.activation.MimeTypeParseException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.Locale;
 
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.activation.MimeTypeParseException;
-
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.result.FragmentResult;
-import org.jboss.portal.portlet.result.Result;
-import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.portlet.Properties;
-import org.jboss.portal.common.MediaType;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.PortletURLImpl;
 
 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.PortletURLImpl;
-
 /**
- * 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,36 +26,36 @@
  * 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 org.jboss.portal.common.system.AbstractJBossService; 
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import org.jboss.portal.common.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.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 
+public class JBossPortletSecurityService extends AbstractJBossService
    implements PortletSecurityService,
    AuthorizationDomain, DomainConfigurator, PermissionRepository, PermissionFactory
@@ -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 setBindings(String uri, Set bindings) throws SecurityConfigurationException
-   { 
+   {
       this.securityConstraintsMap.put(uri, bindings);
    }
 
    public void removeBindings(String uri) throws SecurityConfigurationException
-   { 
+   {
       this.securityConstraintsMap.remove(uri);
    }
 
    public PortalPermission getPermission(String roleName, String uri) throws PortalSecurityException
-   { 
+   {
       Set set = getBindings(uri);
       if (set != null && !set.isEmpty())
       {
@@ -100,42 +123,42 @@
          {
             RoleSecurityBinding sc = (RoleSecurityBinding)i.next();
             String constraintRoleName = sc.getRole();
-            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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInvocationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInvocationContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInvocationContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.URLTools;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 /**
@@ -33,13 +34,9 @@
    /** Cache uses soft references. */
    int REF_SOFT = 1;
 
-   /**
-    * The expiration in seconds.
-    */
+   /** The expiration in seconds. */
    int getExpirationSecs();
 
-   /**
-    * Return the kind of reference to cache markup fragments.
-    */
+   /** Return the kind of reference to cache markup fragments. */
    int getReferenceType();
 }

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.invocation;
 
 import org.jboss.portal.common.invocation.Invocation;
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.Properties;
+import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.result.Result;
+import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.spi.InvocationContext;
 import org.jboss.portal.portlet.spi.PortalContext;
 import org.jboss.portal.portlet.spi.RequestContext;
 import org.jboss.portal.portlet.spi.SecurityContext;
 import org.jboss.portal.portlet.spi.UserContext;
-import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.spi.WindowContext;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -107,9 +108,7 @@
    /** The result. */
    protected Result result;
 
-   /**
-    * Create an invocation to a portlet.
-    */
+   /** Create an invocation to a portlet. */
    protected PortletInvocation(InvocationContext invocationContext)
    {
       this.invocationContext = invocationContext;
@@ -126,17 +125,13 @@
       return dispatcher;
    }
 
-   /**
-    * Set the dispatcher of this invocation.
-    */
+   /** Set the dispatcher of this invocation. */
    public void setDispatcher(Dispatcher dispatcher)
    {
       this.dispatcher = dispatcher;
    }
 
-   /**
-    * Return the invocation context.
-    */
+   /** Return the invocation context. */
    public InvocationContext getContext()
    {
       return invocationContext;
@@ -182,57 +177,43 @@
       this.properties = properties;
    }
 
-   /**
-    * Set the outcome of this request.
-    */
+   /** Set the outcome of this request. */
    public void setResult(Result result)
    {
       this.result = result;
    }
 
-   /**
-    * Return the outcome of this request.
-    */
+   /** Return the outcome of this request. */
    public Result getResult()
    {
       return result;
    }
 
-   /**
-    * Return the dispatched http servlet request.
-    */
+   /** Return the dispatched http servlet request. */
    public HttpServletResponse getDispatchedResponse()
    {
       return dresp;
    }
 
-   /**
-    * Set the dispatched http servlet request.
-    */
+   /** Set the dispatched http servlet request. */
    public void setDispatchedResponse(HttpServletResponse dresp)
    {
       this.dresp = dresp;
    }
 
-   /**
-    * Return the dispatched http servlet request.
-    */
+   /** Return the dispatched http servlet request. */
    public HttpServletRequest getDispatchedRequest()
    {
       return dreq;
    }
 
-   /**
-    * Set the dispatched http servlet request.
-    */
+   /** Set the dispatched http servlet request. */
    public void setDispatchedRequest(HttpServletRequest dreq)
    {
       this.dreq = dreq;
    }
 
-   /**
-    * Deliver call to the container.
-    */
+   /** Deliver call to the container. */
    protected void dispatch() throws Exception, InvocationException
    {
       if (dispatcher == null)
@@ -242,9 +223,7 @@
       dispatcher.dispatch(this);
    }
 
-   /**
-    * A dispatcher for the portlet invocation.
-    */
+   /** A dispatcher for the portlet invocation. */
    public interface Dispatcher
    {
       void dispatch(PortletInvocation invocation) throws PortletInvokerException;

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

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

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

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

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/SecurityErrorResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/SecurityErrorResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/SecurityErrorResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.result;
 
-import org.jboss.portal.portlet.result.ErrorResult;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/StreamResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/StreamResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/StreamResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.result;
 
-import org.jboss.portal.portlet.result.Result;
-
 /**
  * Stream a result to the client directly.
  *

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/SoftTimedContent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/SoftTimedContent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/SoftTimedContent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.result.cache;
 
-import java.lang.ref.WeakReference;
-
 import org.jboss.portal.portlet.result.FragmentResult;
 
+import java.lang.ref.WeakReference;
+
 /**
  * Use soft reference.
  *
@@ -39,9 +40,7 @@
    /** The content. */
    private transient WeakReference content;
 
-   /**
-    * @exception IllegalArgumentException if the content is null
-    */
+   /** @throws IllegalArgumentException if the content is null */
    public SoftTimedContent(FragmentResult content, long expirationTimeMillis) throws IllegalArgumentException
    {
       super(expirationTimeMillis);

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/StrongTimedContent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/StrongTimedContent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/StrongTimedContent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.result.cache;
 
 import org.jboss.portal.portlet.result.FragmentResult;
@@ -37,9 +38,7 @@
    /** The content. */
    private transient FragmentResult content;
 
-   /**
-    * @exception IllegalArgumentException if the content is null
-    */
+   /** @throws IllegalArgumentException if the content is null */
    public StrongTimedContent(FragmentResult content, long expirationTimeMillis) throws IllegalArgumentException
    {
       super(expirationTimeMillis);

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/TimedContent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/TimedContent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/result/cache/TimedContent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.result.cache;
 
 import org.jboss.portal.portlet.result.FragmentResult;
@@ -42,9 +43,7 @@
       this.expirationTimeMillis = expirationTimeMillis;
    }
 
-   /**
-    * Return the content, possibly null. 
-    */
+   /** Return the content, possibly null. */
    public abstract FragmentResult getContent();
 
    /**

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -27,9 +28,9 @@
 import org.jboss.portal.security.spi.provider.PermissionRepository;
 
 import java.security.Permission;
-import java.util.StringTokenizer;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.StringTokenizer;
 
 /**
  * The permission for instance.
@@ -38,7 +39,7 @@
  * @version $Revision$
  */
 public final class PortletPermission extends PortalPermission
-{  
+{
 
    /** The serialVersionUID */
    private static final long serialVersionUID = 8445291296726152562L;
@@ -87,7 +88,7 @@
    public PortletPermission(String uri, Collection actions)
    {
       super("portletpermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -103,7 +104,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/Modification.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/Modification.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/Modification.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.state.AccessMode;
@@ -32,7 +33,7 @@
    /**
     * Return an id that can differenciate instances.
     *
-    * @return the instance id 
+    * @return the instance id
     */
    String getId();
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InvocationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InvocationContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/InvocationContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+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;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -62,23 +63,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.state;
 
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.common.value.ValueMap;
+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.ValueMap;
-import org.jboss.portal.common.value.Value;
-import org.jboss.portal.common.value.SimpleValueMap;
 
+import java.util.Collections;
 import java.util.Set;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -59,10 +60,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/Property.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/Property.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/Property.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -42,19 +43,13 @@
     */
    public static final int PREF_RESET = 1;
 
-   /**
-    * The type of change.
-    */
+   /** The type of change. */
    private int type;
 
-   /**
-    * The key.
-    */
+   /** The key. */
    private String key;
 
-   /**
-    * The possible value.
-    */
+   /** The possible value. */
    private Value value;
 
    public PropertyChange(int type, String key, Value value)

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

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/State.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/State.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/State.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.value.ValueMap;
@@ -59,8 +60,6 @@
     */
    Date getTerminationTime();
 
-   /**
-    * Set the termination time value.
-    */
+   /** Set the termination time value. */
    void setTerminationTime(Date terminationTime);
 }

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StateStore.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StateStore.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StateStore.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.value.ValueMap;
@@ -37,8 +38,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
     */
    State loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -57,20 +58,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 valueMap 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, ValueMap valueMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -80,8 +81,8 @@
     * @param stateId
     * @param valueMap 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, ValueMap valueMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -90,8 +91,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.InstanceContext;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InvocationContextSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InvocationContextSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/InvocationContextSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.InvocationContext;
-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.portlet.PortletURL;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.spi.InvocationContext;
 import org.jboss.portal.server.util.HTTPStreamInfo;
 
 /**

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.tck;
 
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.test.PortletController;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.request.RequestParameter;
 
 import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.InterceptorStack;
@@ -27,8 +28,6 @@
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 
 import java.util.Set;
@@ -66,11 +65,11 @@
             {
                if (e instanceof PortletInvokerException)
                {
-                  throw (PortletInvokerException)e;
+                  throw(PortletInvokerException)e;
                }
                else if (e instanceof RuntimeException)
                {
-                  throw (RuntimeException)e;
+                  throw(RuntimeException)e;
                }
                else
                {
@@ -126,11 +125,11 @@
       {
          if (e instanceof PortletInvokerException)
          {
-            throw (PortletInvokerException)e;
+            throw(PortletInvokerException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.invocation.InvocationException;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.result.InsufficientPrivilegesResult;
 import org.jboss.portal.portlet.security.PortletPermission;
-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>
@@ -37,9 +38,7 @@
 public class TestSecurityInterceptor extends PortletInterceptor
 {
 
-   /**
-    * The auth manager factory.
-    */
+   /** The auth manager factory. */
    private PortalAuthorizationManagerFactory pamf;
 
    public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory()

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.test;
 
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.server.ServerInterceptor;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
-import org.jboss.portal.common.invocation.InvocationException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.Serializable;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
-import java.io.Serializable;
 
 /**
  * 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.value.ValueMap;
-import org.jboss.portal.common.value.Value;
 
 import java.util.HashSet;
 import java.util.Iterator;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.test.support;
 
+import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.InvalidPortletIdException;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.InvalidPortletIdException;
 import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.common.value.ValueMap;
-import org.jboss.portal.common.value.SimpleValueMap;
-import org.jboss.portal.common.system.AbstractJBossService;
 
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Set;
 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>

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.support;
 
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
 
 /**

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

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.support.state;
 
 import org.jboss.portal.common.system.AbstractJBossService;
 import org.jboss.portal.common.value.SimpleValueMap;
 import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.state.producer.InvalidStateIdException;
+import org.jboss.portal.portlet.state.producer.NoSuchStateException;
+import org.jboss.portal.portlet.state.producer.State;
 import org.jboss.portal.portlet.state.producer.StateStore;
-import org.jboss.portal.portlet.state.producer.State;
-import org.jboss.portal.portlet.state.producer.NoSuchStateException;
-import org.jboss.portal.portlet.state.producer.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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.state;
 
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.ValueMap;
 import org.jboss.portal.portlet.state.producer.State;
-import org.jboss.portal.common.value.ValueMap;
-import org.jboss.portal.common.value.SimpleValueMap;
 
 import java.util.Date;
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.portlet.actions.TestAction;
@@ -28,8 +29,7 @@
 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 org.jboss.portal.test.framework.junit.ExtendedAssert;
+import junit.framework.AssertionFailedError;
 import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.framework.junit.ExtendedAssert;
 
-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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.AssertResult;
@@ -47,17 +48,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();
@@ -68,8 +70,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();
@@ -80,8 +83,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();
@@ -93,8 +97,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();
@@ -102,7 +107,8 @@
          }
       });
 
-      seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction(){
+      seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+      {
          protected AssertResult run(Portlet portlet, ActionRequest request, ActionResponse response)
          {
             fail();
@@ -111,7 +117,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();
@@ -122,8 +129,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();
@@ -131,7 +139,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();
@@ -142,15 +151,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
+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.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)
@@ -116,9 +117,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");
    }
 
@@ -126,7 +127,7 @@
    {
       try
       {
-         param.setValues(null, new String[] { "a" });
+         param.setValues(null, new String[]{"a"});
          fail("Expected IllegalArgumentException");
       }
       catch (IllegalArgumentException e)
@@ -162,7 +163,7 @@
    {
       try
       {
-         param.setValues("a", new String[] { "a", null });
+         param.setValues("a", new String[]{"a", null});
          fail("Expected IllegalArgumentException");
       }
       catch (IllegalArgumentException e)
@@ -186,18 +187,18 @@
    {
       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(param.getValue("a"), "b");
-      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)
@@ -254,7 +255,7 @@
       try
       {
          Map map = new HashMap();
-         map.put("a", new String[] { null });
+         map.put("a", new String[]{null});
          param.replace(map);
          fail("Expected IllegalArgumentException");
       }
@@ -276,16 +277,16 @@
    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("_f", new String[]{"_g"});
       param.replace(map);
-      assertTrue(Arrays.equals(param.getValues("a"), new String[] {"_b"}));
-      assertTrue(Arrays.equals(param.getValues("c"), new String[] {"_d","_e"}));
-      assertTrue(Arrays.equals(param.getValues("_f"), new String[] {"_g"}));
+      assertTrue(Arrays.equals(param.getValues("a"), new String[]{"_b"}));
+      assertTrue(Arrays.equals(param.getValues("c"), new String[]{"_d", "_e"}));
+      assertTrue(Arrays.equals(param.getValues("_f"), new String[]{"_g"}));
       assertEquals(null, map.get("g"));
    }
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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.server.request.RequestParameter;
-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 org.jboss.portal.server.request.RequestParameter;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -182,7 +183,7 @@
       params.clear();
 
       // Query mode two values
-      params.put(PortletRequestDecoder.MODE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(),Mode.EDIT.toString()}));
+      params.put(PortletRequestDecoder.MODE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), Mode.EDIT.toString()}));
       o.decode(params);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -264,7 +265,6 @@
       assertNull(o.getWindowState());
       params.clear();
 
-
       // Query window state
       params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)));
       params.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.WINDOW_STATE_PARAMETER, WindowState.NORMAL.toString()));
@@ -299,7 +299,7 @@
       params.clear();
 
       // Query meta parameter
-      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK),"bar"}));
+      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK), "bar"}));
       o.decode(params);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -312,8 +312,8 @@
       params.clear();
 
       // Query window state parameter + window state meta parameter
-      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK|PortletRequestDecoder.WINDOW_STATE_MASK)}));
-      params.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(),"bar"}));
+      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)}));
+      params.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(), "bar"}));
       o.decode(params);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -340,8 +340,8 @@
       params.clear();
 
       // Query mode parameter + mode meta parameter
-      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK|PortletRequestDecoder.MODE_MASK)}));
-      params.put(PortletRequestDecoder.MODE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(),"bar"}));
+      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.MODE_MASK)}));
+      params.put(PortletRequestDecoder.MODE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), "bar"}));
       o.decode(params);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -382,11 +382,11 @@
 
       // Query multivalued parameter
       params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.RENDER_MASK)));
-      params.put("foo", RequestParameter.createQuery("foo", new String[]{"bar1","bar2"}));
+      params.put("foo", RequestParameter.createQuery("foo", new String[]{"bar1", "bar2"}));
       o.decode(params);
       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());
@@ -502,7 +502,6 @@
       assertNull(o.getWindowState());
       params.clear();
 
-
       // Query window state
       params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)));
       params.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.WINDOW_STATE_PARAMETER, WindowState.NORMAL.toString()));
@@ -540,10 +539,10 @@
 
       // Query multivalued parameter
       params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
-      params.put("foo", RequestParameter.createQuery("foo", new String[]{"bar1","bar2"}));
+      params.put("foo", RequestParameter.createQuery("foo", new String[]{"bar1", "bar2"}));
       o.decode(params);
       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());
@@ -570,9 +569,9 @@
 
       // Body multivalued parameter
       params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
-      params.put("foo", RequestParameter.createBody("foo", new String[]{"bar1","bar2"}));
+      params.put("foo", RequestParameter.createBody("foo", new String[]{"bar1", "bar2"}));
       o.decode(params);
-      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());
@@ -627,12 +626,12 @@
       // Body parameters
       params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK)));
       params.put("foo1", RequestParameter.createBody("foo1", "bar1"));
-      params.put("foo2", RequestParameter.createBody("foo2", new String[]{"bar2","bar3"}));
+      params.put("foo2", RequestParameter.createBody("foo2", new String[]{"bar2", "bar3"}));
       params.put("foo3", RequestParameter.create("foo3", new String[]{"bar4"}, new String[]{"bar5"}));
       o.decode(params);
       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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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>
@@ -89,29 +86,28 @@
             assertTrue(keys.contains("multi_pref_bis"));
 
 
-
             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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.AssertResult;
@@ -49,10 +50,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)
@@ -74,10 +72,7 @@
       });
    }
 
-   /**
-    * ActionRequest.getProperty()
-    * ActionRequest.getProperties()
-    */
+   /** ActionRequest.getProperty() ActionRequest.getProperties() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -126,11 +121,7 @@
       });
    }
 
-   /**
-    * ActionRequest.getAttribute()
-    * ActionRequest.setAttribute()
-    * ActionRequest.removeAttribute()
-    */
+   /** ActionRequest.getAttribute() ActionRequest.setAttribute() ActionRequest.removeAttribute() */
    public void createAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -189,10 +180,7 @@
       });
    }
 
-   /**
-    * ActionRequest.getParameter()
-    * ActionRequest.getParameterValues()
-    */
+   /** ActionRequest.getParameter() ActionRequest.getParameterValues() */
    public void createParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -241,7 +229,4 @@
    }
 
 
-
-
-
 }

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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;
@@ -47,11 +48,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 +143,7 @@
 
             Map map = new HashMap();
 
-            map.put("name","val");
+            map.put("name", "val");
             map.put(null, "val");
 
             try
@@ -197,7 +194,6 @@
          {
 
 
-
             return new EndTestResult();
          }
       });
@@ -207,10 +203,7 @@
    //PortletResponse methods:
    //************************
 
-   /**
-    * ActionResponse.setProperty()
-    * ActionResponse.addProperty()
-    */
+   /** ActionResponse.setProperty() ActionResponse.addProperty() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -259,9 +252,7 @@
       });
    }
 
-   /**
-    * ActionResponse.encodeURL()
-    */
+   /** ActionResponse.encodeURL() */
    public void createEncodeURLCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.api.portletpreferences;
 
+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;
-import org.jboss.portal.test.framework.container.result.AssertResult;
 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.PortletURL;
 import javax.portlet.ValidatorException;
 import java.io.IOException;
 
@@ -51,9 +52,7 @@
 public class PortletPreferencesSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * PortletPreferences.isReadOnly()
-    */
+   /** PortletPreferences.isReadOnly() */
    public void createReadOnlyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -78,9 +77,7 @@
    }
 
    /**
-    * PortletPreferences.getValue()
-    * PortletPreferences.getValues()
-    * PortletPreferences.setValue()
+    * PortletPreferences.getValue() PortletPreferences.getValues() PortletPreferences.setValue()
     * PortletPreferences.setValues()
     */
    public void createValueCase(SequenceRegistry registry)
@@ -199,9 +196,7 @@
       });
    }
 
-   /**
-    * PortletPreferences.reset()
-    */
+   /** PortletPreferences.reset() */
    public void createResetNullKeyThrowsNPE(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.jsr168.ext.portletmode;
 
+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;
+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.AssertResult;
-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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,58 +1,57 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.test.framework.portlet.Sequence;
-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.container.result.Result;
-import org.jboss.portal.test.framework.container.result.InvokePostResult;
+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.common.util.Tools;
+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;
+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 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 javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
+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>
@@ -64,9 +63,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)
    {
@@ -136,8 +134,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)
    {
@@ -216,8 +214,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)
    {
@@ -293,8 +291,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)
    {
@@ -328,8 +326,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)
    {
@@ -400,10 +398,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,51 +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.portlet.jsr168.ext.preferences;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+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;
 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.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP10;
+import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP2;
-import org.jboss.portal.test.framework.portlet.universal.UTP9;
 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 org.jboss.portal.test.framework.container.result.AssertResult;
 
+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;
 
@@ -57,6 +55,7 @@
 {
    /**
     * Asserts that isReadOnly() returns correct values during both render and action phase
+    *
     * @param registry
     */
    public void createIsReadOnlyCase(SequenceRegistry registry)

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,58 +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.portlet.jsr168.ext.session;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+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;
 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.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.actions.TestAction;
 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.UTP2;
-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.framework.container.result.AssertResult;
 
-import javax.portlet.Portlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletURL;
 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;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
-import java.util.Enumeration;
-import java.util.regex.Pattern;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -126,12 +122,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)
    {
@@ -166,5 +161,5 @@
 
 
    }
-   
+
 }

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.AssertResult;
@@ -63,12 +64,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)
    {
@@ -120,8 +121,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)
    {
@@ -178,15 +179,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)
    {
@@ -226,8 +223,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)
    {
@@ -264,11 +261,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)
@@ -370,10 +366,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)
    {
@@ -434,25 +428,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)
    {
@@ -580,10 +572,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)
    {
@@ -626,12 +618,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.AssertResult;
@@ -61,8 +62,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)
    {
@@ -80,12 +81,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)
    {
@@ -158,9 +159,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)
    {
@@ -196,11 +197,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)
    {
@@ -276,10 +275,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)
    {
@@ -324,11 +322,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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;
@@ -29,7 +30,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public class  PortletRequestTestSuite
+public class PortletRequestTestSuite
 {
    public static Test suite()
    {
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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 +40,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 +53,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)
    {
@@ -105,9 +95,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)
    {
@@ -146,9 +136,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)
@@ -233,13 +223,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)
    {
@@ -282,13 +270,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)
    {
@@ -340,7 +327,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)
    {
@@ -377,13 +365,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)
    {
@@ -421,10 +407,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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;
@@ -63,10 +64,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)
    {
@@ -108,9 +108,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)
    {
@@ -236,10 +236,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)
    {
@@ -281,9 +280,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)
    {
@@ -325,10 +324,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)
    {
@@ -390,12 +389,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)
    {
@@ -446,12 +444,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)
    {
@@ -516,10 +512,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)
    {
@@ -544,8 +539,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)
    {
@@ -587,8 +582,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)
    {
@@ -618,10 +613,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)
    {
@@ -677,13 +671,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)
    {
@@ -709,9 +702,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)))
@@ -734,10 +725,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)
    {
@@ -782,13 +772,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)
    {
@@ -812,8 +800,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.junit.ExtendedAssert;

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.AssertResult;
@@ -28,10 +29,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;
@@ -39,20 +40,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;
 
@@ -64,13 +63,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)
    {
@@ -109,22 +106,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)
    {
@@ -219,13 +214,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)
    {
@@ -272,8 +265,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)
    {
@@ -317,8 +310,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.AssertResult;
@@ -52,9 +53,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)
    {
@@ -90,12 +90,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"
     */
@@ -201,8 +200,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)
    {
@@ -229,9 +228,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)
    {
@@ -257,10 +256,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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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;
@@ -45,7 +46,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 +62,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)
    {
@@ -141,8 +142,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)
    {
@@ -194,8 +195,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.
     */
@@ -298,8 +299,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)
    {
@@ -399,8 +400,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)
    {
@@ -478,8 +479,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)
    {
@@ -508,8 +509,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)
    {
@@ -588,10 +589,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)
    {
@@ -706,9 +706,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)
    {
@@ -726,9 +725,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)
@@ -811,10 +810,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)
    {
@@ -894,8 +892,4 @@
    }
 
 
-
-
-   
-
 }

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.state;
 
 import junit.framework.TestCase;
+import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.InvalidPortletIdException;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.state.producer.NoSuchStateException;
+import org.jboss.portal.portlet.state.producer.State;
 import org.jboss.portal.portlet.state.producer.StatefulPortletInvoker;
-import org.jboss.portal.portlet.state.producer.State;
-import org.jboss.portal.portlet.state.producer.NoSuchStateException;
-import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.InvalidPortletIdException;
 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.state.StateStoreSupport;
-import org.jboss.portal.portlet.test.support.PortletSupport;
-import org.jboss.portal.common.value.StringValue;
-import org.jboss.portal.common.value.ValueMap;
-import org.jboss.portal.common.value.SimpleValueMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/portlet-app_1_0.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/portlet-app_1_0.xsd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/portlet-app_1_0.xsd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" xml:lang="en">
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<schema targetNamespace="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+        xmlns="http://www.w3.org/2001/XMLSchema" xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"
+        version="1.0" xml:lang="en">
 	<annotation>
 		<documentation>
 		This is the XML Schema for the Portlet 1.0 deployment descriptor.
@@ -19,8 +45,8 @@
 		  names are preferred for consistency with the Servlet API.
 		</documentation>
 	</annotation>
-	<!-- *********************************************************** -->
-	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+   <!-- *********************************************************** -->
+   <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 	<element name="portlet-app" type="portlet:portlet-appType">
 		<annotation>
 			<documentation>
@@ -115,10 +141,13 @@
 					<field xpath="portlet:role-name"/>
 				</unique>
 			</element>
-			<element name="custom-portlet-mode" type="portlet:custom-portlet-modeType" minOccurs="0" maxOccurs="unbounded"/>
-			<element name="custom-window-state" type="portlet:custom-window-stateType" minOccurs="0" maxOccurs="unbounded"/>
+			<element name="custom-portlet-mode" type="portlet:custom-portlet-modeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+			<element name="custom-window-state" type="portlet:custom-window-stateType" minOccurs="0"
+                  maxOccurs="unbounded"/>
 			<element name="user-attribute" type="portlet:user-attributeType" minOccurs="0" maxOccurs="unbounded"/>
-			<element name="security-constraint" type="portlet:security-constraintType" minOccurs="0" maxOccurs="unbounded"/>
+			<element name="security-constraint" type="portlet:security-constraintType" minOccurs="0"
+                  maxOccurs="unbounded"/>
 		</sequence>
 		<attribute name="version" type="string" use="required"/>
 		<attribute name="id" type="string" use="optional"/>
@@ -550,8 +579,8 @@
 			<extension base="string"/>
 		</simpleContent>
 	</complexType>
-	<!--- everything below is copied from j2ee_1_4.xsd -->
-	<complexType name="descriptionType">
+   <!--- everything below is copied from j2ee_1_4.xsd -->
+   <complexType name="descriptionType">
 		<annotation>
 			<documentation>
 			The description element is used to provide text describing the 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/samples-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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.common.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.common.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.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>
--->
+   <!--
+      <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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/tck-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/jboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/jboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/deployment/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 -->
@@ -155,8 +178,10 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.common.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 -->
@@ -167,7 +192,8 @@
       xmbean-code="org.jboss.portal.common.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 -->
@@ -177,7 +203,8 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.common.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>
 

Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/portlet/src/resources/test-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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>
@@ -103,8 +126,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. -->
@@ -119,8 +142,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <!-- -->
       <mkdir dir="${build.lib}"/>
@@ -137,10 +160,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: branches/JBoss_Portal_Branch_2_4/security/imports/test-jars.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/imports/test-jars.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/imports/test-jars.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -66,27 +67,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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.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 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$
@@ -65,8 +65,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
     */
@@ -79,9 +79,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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalSecurityException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalSecurityException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/PortalSecurityException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/SecurityConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/SecurityConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/SecurityConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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,14 +29,9 @@
  */
 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();
 
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.SecurityConstants;
 import org.jboss.portal.security.PortalSecurityException;
+import org.jboss.portal.security.SecurityConstants;
+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.PolicyContext;
 import javax.security.jacc.PolicyConfigurationFactory;
-import javax.security.auth.Subject;
-import java.security.ProtectionDomain;
-import java.security.Principal;
+import javax.security.jacc.PolicyContext;
 import java.security.Policy;
+import java.security.Principal;
+import java.security.ProtectionDomain;
+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>
  * @since Jan 30, 2006
@@ -129,9 +129,7 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.security.PortalAuthorizationManager#hasPermission(String, String, String)
-    */
+   /** @see org.jboss.portal.security.PortalAuthorizationManager#hasPermission(String,String,String) */
    public boolean internalCheckPermission(PortalPermission permission) throws Exception
    {
       // Get the current context id.
@@ -148,7 +146,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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.system.AbstractJBossService;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.security.AuthorizationDomainRegistry;
 import org.jboss.portal.security.PortalPermission;
-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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatPermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatPermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/FlatPermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/Server.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/Server.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/Server.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/security/src/resources/log4j.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/security/src/resources/log4j.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/security/src/resources/log4j.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -132,15 +155,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>    
 
@@ -155,10 +178,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>
@@ -246,8 +269,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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/AbstractServerURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/AbstractServerURL.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/AbstractServerURL.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/PortalConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/PortalConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/RequestController.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/RequestController.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/RequestController.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/Server.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/Server.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/Server.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInvocation.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerInvocation.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.navigation.NavigationalStateContext;
@@ -87,12 +88,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)
@@ -107,9 +108,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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequestContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequestContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerRequestContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
 import org.jboss.portal.server.request.URLContext;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
-import java.nio.charset.Charset;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -34,14 +34,10 @@
 public interface ServerRequestContext
 {
 
-   /**
-    * Return the parameter map.
-    */
+   /** Return the parameter map. */
    Map getParameterMap();
 
-   /**
-    * 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();
 
    /**
@@ -49,23 +45,15 @@
     */
    // Charset getCharset();
 
-   /**
-    * Return the url context of this request. 
-    */
+   /** Return the url context of this request. */
    URLContext getURLContext();
 
-   /**
-    * Return the request that made the connection to the server.
-    */
+   /** Return the request that made the connection to the server. */
    HttpServletRequest getClientRequest();
 
-   /**
-    * 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();
 }

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.util.HTTPStreamInfo;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.server.util.HTTPStreamInfo;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponseContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponseContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerResponseContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -42,7 +43,6 @@
    HttpServletResponse getClientResponse();
 
    /**
-    *
     * @param url
     * @param context
     * @param format

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerURL.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/ServerURL.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.aspects.server;
 
+import org.jboss.portal.common.MediaType;
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.server.ServerException;
 import org.jboss.portal.server.ServerInterceptor;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerResponse;
-import org.jboss.portal.server.ServerException;
-import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.common.MediaType;
 
 import javax.servlet.http.HttpServletRequest;
 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.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.server.ServerRequest;
-import org.jboss.portal.common.invocation.InvocationException;
 
 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -40,10 +41,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$
@@ -51,24 +51,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()
@@ -150,14 +142,10 @@
    public static class DispatcherImpl implements CommandServlet.Dispatcher
    {
 
-      /**
-       * .
-       */
+      /** . */
       private final HttpServletRequest req;
 
-      /**
-       * .
-       */
+      /** . */
       private final HttpServletResponse resp;
 
       public DispatcherImpl(ServerInvocation invocation)

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfig.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfig.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfig.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfigService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfigService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/config/ServerConfigService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.system.AbstractJBossService;
+import org.jboss.portal.common.util.CLLoader;
 import org.jboss.portal.common.util.LoaderResource;
-import org.jboss.portal.common.util.CLLoader;
 
+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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CustomPortalWebApp.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CustomPortalWebApp.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/CustomPortalWebApp.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -70,9 +71,7 @@
       }
    }
 
-   /**
-    * Recognize the jbossweb container and returns its version.
-    */
+   /** Recognize the jbossweb container and returns its version. */
    private static int getVersion()
    {
       try

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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$

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
 
 /**

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.system.AbstractJBossService;
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/ServerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/ServerImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/ServerImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.impl;
 
 import org.jboss.portal.common.system.AbstractJBossService;
-import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.Version;
-import org.jboss.portal.server.Server;
 import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.Server;
 import org.jboss.portal.server.config.ServerConfig;
 
-import java.io.InputStream;
-
 /**
  * Should bootstrap the microcontainer in the (near) future.
  *

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.invocation;
 
-import org.jboss.portal.common.system.AbstractJBossService;
 import org.jboss.portal.common.invocation.Interceptor;
 import org.jboss.portal.common.invocation.Invocation;
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.common.system.AbstractJBossService;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.impl.invocation;
 
-import org.jboss.portal.common.invocation.InterceptorStack;
 import org.jboss.portal.common.invocation.Interceptor;
+import org.jboss.portal.common.invocation.InterceptorStack;
 import org.jboss.portal.common.system.AbstractJBossService;
 
 import javax.management.ObjectName;
 import java.util.List;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -65,6 +65,7 @@
    {
       return interceptors;
    }
+
    /**
     * Add's the supplied name to the list of interceptor names.
     *
@@ -92,9 +93,7 @@
       rebuild();
    }
 
-   /**
-    * Rebuild the interceptor stack.
-    */
+   /** Rebuild the interceptor stack. */
    public void rebuild() throws Exception
    {
       if (interceptorNames != null)

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/navigation/NavigationalStateContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/navigation/NavigationalStateContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/navigation/NavigationalStateContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.navigation;
 
 import java.io.Serializable;
@@ -57,7 +58,7 @@
    /**
     * Store a navigational state in the context.
     *
-    * @param id the id
+    * @param id    the id
     * @param state the new state or null if the state must be removed
     * @throws IllegalArgumentException if the id is null
     */

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/RequestParameter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/RequestParameter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/RequestParameter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.request;
 
+import java.util.AbstractList;
 import java.util.List;
-import java.util.AbstractList;
 
 /**
  * A request parameter. It implements the list interface to give access to the values of the parameter.
@@ -45,7 +46,7 @@
    /**
     * Creates a new parameter.
     *
-    * @param name the parameter name
+    * @param name   the parameter name
     * @param values the parameter values
     * @throws IllegalArgumentException when there is a bad argument
     */
@@ -144,8 +145,7 @@
    }
 
    /**
-    * Return the values of the parameter. The returned array is a clone of the original one
-    * so it can be modified.
+    * Return the values of the parameter. The returned array is a clone of the original one so it can be modified.
     *
     * @return the values
     */

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLFormat.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLFormat.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/request/URLFormat.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMapping.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMapping.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMapping.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathParser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathParser.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PathParser.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -28,6 +29,7 @@
 import org.jboss.portal.common.invocation.InvocationException;
 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.Server;
 import org.jboss.portal.server.ServerException;
@@ -37,10 +39,9 @@
 import org.jboss.portal.server.ServerResponse;
 import org.jboss.portal.server.ServerResponseContext;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.request.RequestParameter;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
-import org.jboss.portal.server.request.RequestParameter;
 
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
@@ -51,12 +52,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
 import java.util.StringTokenizer;
-import java.nio.charset.Charset;
 
 /**
  * The main servlet of the portal. This servlet must be properly configured with the servlet mapping style it is
@@ -263,7 +264,7 @@
       portalContextPath = URLTools.decodeXWWWFormURL(portalContextPath);
 
       //
-      URLContext urlContext= parseURLContext(req);
+      URLContext urlContext = parseURLContext(req);
 
       //
       Map parameterMap = parseParameters(req);

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/AbstractTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/AbstractTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/AbstractTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/PortalTestSetup.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/PortalTestSetup.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/PortalTestSetup.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/AbstractTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/AbstractTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/AbstractTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.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 java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/GetTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/GetTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.charset;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.server.parameters.Utils;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.AbstractServerURL;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequestContext;
-import org.jboss.portal.server.request.RequestParameter;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.charset;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.charset;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.server.charset;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.AbstractServerURL;
-import org.jboss.portal.server.PortalConstants;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.charset;
 
-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.InvokePostResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.charset;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.parameters;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.request.RequestParameter;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -44,7 +45,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);

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.parameters;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.request.RequestParameter;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -46,13 +47,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});
@@ -60,7 +61,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);

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.parameters;
 
-import org.jboss.portal.test.server.AbstractTest;
-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.AssertResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.request.RequestParameter;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -46,13 +47,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();

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/Utils.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/Utils.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/parameters/Utils.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.servlet;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.AssertResult;
-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.FailureResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+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.server.AbstractTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -44,7 +45,7 @@
    {
       ServerRequest req = invocation.getRequest();
       final ServerRequestContext ctx = req.getContext();
-      switch(TestCaseContext.getCurrentRequestCount())
+      switch (TestCaseContext.getCurrentRequestCount())
       {
          case 0:
             result.execute(new AssertResult.Test()

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.servlet;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.AssertResult;
-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.FailureResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+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.server.AbstractTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -44,7 +45,7 @@
    {
       ServerRequest req = invocation.getRequest();
       final ServerRequestContext ctx = req.getContext();
-      switch(TestCaseContext.getCurrentRequestCount())
+      switch (TestCaseContext.getCurrentRequestCount())
       {
          case 0:
             result.execute(new AssertResult.Test()

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.server.servlet;
 
-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.InvokeGetResult;
-import org.jboss.portal.test.framework.container.result.FailureResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+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.server.AbstractTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -44,7 +45,7 @@
    {
       ServerRequest req = invocation.getRequest();
       final ServerRequestContext ctx = req.getContext();
-      switch(TestCaseContext.getCurrentRequestCount())
+      switch (TestCaseContext.getCurrentRequestCount())
       {
          case 0:
             result.execute(new AssertResult.Test()

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/portal-server-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-charset-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-parameters-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/conf/config.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-servlet-sar/conf/config.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-session-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-session-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test/test-session-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/server/src/resources/test-agent-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -185,8 +208,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: branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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>
       <connection-url>jdbc:hsqldb:file:test</connection-url>

Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.framework.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;
+import org.jboss.portal.test.framework.junit.ExtendedAssert;
 
 /**
  * A set of assertions as result.
@@ -71,7 +72,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
    {
@@ -115,25 +116,19 @@
       public abstract void run() throws Exception;
    }
 
-   /**
-    * Return how many times the execute method has been successfully invoked.
-    */
+   /** Return how many times the execute method has been successfully invoked. */
    public int getCount()
    {
       return count;
    }
 
-   /**
-    * 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/Result.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/Result.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/result/Result.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.test.framework.embedded;
 
+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.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
-import javax.naming.InitialContext;
-import java.util.Hashtable;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.io.InputStream;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.Statement;
-import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
 
 /**
  * An helper to setup JDNI available objects
@@ -245,7 +246,7 @@
          {
             in = 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 connectionURLElt = XML.getUniqueChild(childElt, "connection-url", true);

Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.junit;
 
+import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import junit.framework.TestCase;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 
 /**
  * Database test suite.

Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/ExtendedAssert.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/ExtendedAssert.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/ExtendedAssert.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.junit;
 
 import junit.framework.Assert;
@@ -34,17 +35,13 @@
 public class ExtendedAssert extends Assert
 {
 
-   /**
-    * @see #assertEquals(Object[], Object[])
-    */
+   /** @see #assertEquals(Object[],Object[]) */
    public static void assertEquals(Object[] expected, Object[] actual)
    {
       assertEquals(null, (Object[])expected, (Object[])actual);
    }
 
-   /**
-    * Test equality as defined by java.util.Array#equals(Object[], Object[]).
-    */
+   /** Test equality as defined by java.util.Array#equals(Object[], Object[]). */
    public static void assertEquals(String message, Object[] expected, Object[] actual)
    {
       if (Arrays.equals(expected, actual))
@@ -54,17 +51,13 @@
       fail(format(message, expected, actual));
    }
 
-   /**
-    * @see #assertEquals(byte[], byte[])
-    */
+   /** @see #assertEquals(byte[],byte[]) */
    public static void assertEquals(byte[] expected, byte[] actual)
    {
       assertEquals(null, expected, actual);
    }
 
-   /**
-    * Test equality as defined by java.util.Array#equals(Object[], Object[]).
-    */
+   /** Test equality as defined by java.util.Array#equals(Object[], Object[]). */
    public static void assertEquals(String message, byte[] expected, byte[] actual)
    {
       if (Arrays.equals(expected, actual))
@@ -74,8 +67,9 @@
       fail(format(message, expected, actual));
    }
 
-   private static String format(String message, Object expected, Object actual) {
-      String formatted= "";
+   private static String format(String message, Object expected, Object actual)
+   {
+      String formatted = "";
       if (message != null)
       {
          formatted = message + " ";

Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/TransactionAssert.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/TransactionAssert.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/junit/TransactionAssert.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.junit;
 
 import junit.framework.Assert;
 
-import javax.transaction.UserTransaction;
-import javax.transaction.Status;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -58,9 +59,7 @@
       }
    }
 
-   /**
-    * Commit the transaction or fail.
-    */
+   /** Commit the transaction or fail. */
    public static void commitTransaction()
    {
       try
@@ -74,9 +73,7 @@
       }
    }
 
-   /**
-    * Rollback the transaction or fail.
-    */
+   /** Rollback the transaction or fail. */
    public static void rollbackTransaction()
    {
       rollbackTransaction(true);
@@ -115,9 +112,7 @@
       }
    }
 
-   /**
-    * Begin a transaction or fail.
-    */
+   /** Begin a transaction or fail. */
    public static void beginTransaction()
    {
       try
@@ -131,10 +126,7 @@
       }
    }
 
-   /**
-    * If no transaction do nothing.
-    * End the transaction if it is active or marked for rollback otherwise fail.
-    */
+   /** If no transaction do nothing. End the transaction if it is active or marked for rollback otherwise fail. */
    public static void endTransaction()
    {
       try

Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -113,8 +136,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. -->
@@ -129,8 +152,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <!-- -->
       <mkdir dir="${build.lib}"/>

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestHelper.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestHelper.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.theme;
 
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerRequestContext;
+import org.jboss.portal.server.navigation.NavigationalStateContext;
 import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.server.navigation.NavigationalStateContext;
-import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.theme.LayoutService;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ThemeService;
-import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.deployment.jboss.PortalLayoutMetaDataFactory;
 import org.jboss.portal.theme.deployment.jboss.RenderSetMetaDataFactory;
 import org.jboss.portal.theme.impl.LayoutServiceImpl;
@@ -63,10 +64,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.io.StringReader;
-import java.io.Reader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.Principal;

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 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.DivRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.DivWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.DivPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * <renderSet name="emptyRenderer">
- * <set content-type="text/html">
- * <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> <renderSet name="emptyRenderer"> <set content-type="text/html"> <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.EmptyWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.EmptyPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * </portal-renderSet>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> </portal-renderSet>
  * <p/>
  * </p>
  *

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -10,8 +33,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;
@@ -170,10 +193,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalLayout.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalLayout.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalLayout.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -31,31 +32,30 @@
 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 request      the current server request
     * @param response     the current server response
-    * @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
     */
@@ -74,26 +74,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalTheme.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalTheme.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/PortalTheme.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/RuntimeContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/RuntimeContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/RuntimeContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.FQN;
@@ -31,9 +32,7 @@
  */
 public class ServerRegistrationID extends FQN
 {
-   /**
-    * The serialVersionUID
-    */
+   /** The serialVersionUID */
    private static final long serialVersionUID = 8042337046523234207L;
 
    private String desc = null;
@@ -81,24 +80,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");
 
    /**
@@ -172,9 +163,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeConstants.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeConstants.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeElement.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeElement.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeElement.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeLink.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeLink.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeLink.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeScript.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeScript.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeScript.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.MediaType;
+import org.jboss.portal.theme.metadata.RenderSetMetaData;
+import org.jboss.portal.theme.metadata.RendererSetMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.portal.theme.metadata.RenderSetMetaData;
-import org.jboss.portal.theme.metadata.RendererSetMetaData;
-import org.jboss.portal.common.MediaType;
 import org.xml.sax.Attributes;
 
 import javax.activation.MimeTypeParseException;

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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;
@@ -21,9 +44,7 @@
  */
 public final class JSPLayout extends PortalLayout
 {
-   /**
-    * @see PortalLayout#assembleResponse(ServerRequest, ServerResponse, MarkupResult)
-    */
+   /** @see PortalLayout#assembleResponse(ServerRequest,ServerResponse,MarkupResult) */
    public void assembleResponse(ServerRequest request, ServerResponse response, MarkupResult markupResult)
       throws ServletException, IOException
    {

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -29,13 +30,13 @@
 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;
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.impl;
 
 import org.apache.log4j.Logger;
 import org.jboss.portal.common.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.system.Service;
 
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.common.system.AbstractJBossService;
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivDecorationRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivDecorationRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivPortletRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivPortletRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivPortletRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivRegionRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivRegionRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivRegionRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 import org.jboss.portal.theme.page.Region;
@@ -41,9 +42,7 @@
 public class DivRegionRenderer
    implements RegionRenderer
 {
-   /**
-    * @see RegionRenderer#render
-    */
+   /** @see RegionRenderer#render */
    public void render(RenderContext renderContext, Region region, Map portletContexts, Map windowResults) throws RenderException
    {
       StringBuffer markup = renderContext.getMarkupFragment();
@@ -78,16 +77,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivWindowRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivWindowRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/DivWindowRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyDecorationRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyDecorationRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyPortletRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyPortletRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyPortletRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyRegionRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyRegionRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyRegionRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyWindowRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyWindowRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/render/EmptyWindowRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
 
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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,24 +29,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.DivRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.DivWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.DivPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * <renderSet name="emptyRenderer">
- * <set content-type="text/html">
- * <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> <renderSet name="emptyRenderer"> <set content-type="text/html"> <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.EmptyWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.EmptyPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * </portal-renderSet>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> </portal-renderSet>
  * <p/>
  * </p>
  *

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/MarkupContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/MarkupContainer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/MarkupContainer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.server.navigation.NavigationalStateContext;

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

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.portlet.Properties;
 import org.jboss.portal.server.navigation.NavigationalStateContext;
-import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.theme.render.ModifiableMarkupResult;
 
 import java.util.Map;
@@ -34,15 +35,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.server.navigation.NavigationalStateContext;
@@ -28,8 +29,8 @@
 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/PageService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/Region.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/Region.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/Region.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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;
@@ -26,8 +27,8 @@
 import java.util.List;
 
 /**
- * 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$
@@ -41,7 +42,8 @@
    private RegionOrientation orientation;
 
    /**
-    * 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
     */
@@ -70,33 +72,25 @@
       this.orientation = (orientation == null ? RegionOrientation.DEFAULT : orientation);
    }
 
-   /**
-    * @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)
@@ -121,8 +115,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionNames.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionNames.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionNames.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/RegionResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.server.navigation.NavigationalStateContext;

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

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/page/WindowResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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$
@@ -53,15 +49,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
     */
@@ -102,17 +99,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;
@@ -145,19 +138,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.Mode;
@@ -98,8 +99,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
     */
@@ -109,9 +110,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.common.MediaType;
-import org.jboss.portal.theme.ServerRegistrationID;
 import org.jboss.portal.theme.RuntimeContext;
+import org.jboss.portal.theme.ServerRegistrationID;
 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>
@@ -49,9 +50,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
@@ -84,9 +88,7 @@
       return registrationId;
    }
 
-   /**
-    * @see PortalRenderSet#getMediaType
-    */
+   /** @see PortalRenderSet#getMediaType */
    public MediaType getMediaType()
    {
       return contentType;
@@ -112,41 +114,31 @@
       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()) + ": " +

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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.Mode;
@@ -41,10 +42,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$
@@ -98,8 +98,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
@@ -145,13 +145,12 @@
    }
 
    /**
-    * 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
     */
@@ -170,8 +169,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
@@ -181,57 +180,45 @@
       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
@@ -253,21 +240,19 @@
       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)
@@ -296,21 +281,19 @@
       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)
@@ -351,11 +334,12 @@
    }
 
    /**
-    * 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)
@@ -385,25 +369,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();
@@ -432,17 +410,13 @@
       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();
@@ -468,8 +442,8 @@
 
    /**
     * 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

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/RenderException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/Renderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/Renderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/Renderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -147,9 +147,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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, 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: branches/JBoss_Portal_Branch_2_4/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/build.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/build.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/AccessDeniedFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/AccessDeniedFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/AccessDeniedFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/BlockingInteractionResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/BlockingInteractionResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/BlockingInteractionResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CacheControl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CacheControl.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CacheControl.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClientData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClientData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClientData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClonePortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClonePortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ClonePortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Contact.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Contact.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Contact.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CookieProtocol.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CookieProtocol.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/CookieProtocol.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)
@@ -6,8 +29,8 @@
 package org.jboss.portal.wsrp.core;
 
 
+import java.io.Serializable;
 import java.util.HashMap;
-import java.io.Serializable;
 
 public class CookieProtocol implements Serializable
 {

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyFailed.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyFailed.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyFailed.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortlets.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortlets.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortlets.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortletsResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortletsResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/DestroyPortletsResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/EmployerInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/EmployerInfo.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/EmployerInfo.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Extension.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Extension.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Extension.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Fault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Fault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Fault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetMarkup.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetMarkup.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetMarkup.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletProperties.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletProperties.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletProperties.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletPropertyDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletPropertyDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetPortletPropertyDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetServiceDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetServiceDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/GetServiceDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InconsistentParametersFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InconsistentParametersFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InconsistentParametersFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InitCookie.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InitCookie.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InitCookie.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InteractionParams.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InteractionParams.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InteractionParams.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidCookieFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidCookieFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidCookieFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidHandleFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidHandleFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidHandleFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidRegistrationFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidRegistrationFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidRegistrationFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidSessionFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidSessionFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidSessionFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidUserCategoryFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidUserCategoryFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/InvalidUserCategoryFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ItemDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ItemDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ItemDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/LocalizedString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/LocalizedString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/LocalizedString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupParams.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupParams.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupParams.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MissingParametersFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MissingParametersFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/MissingParametersFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelTypes.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelTypes.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModelTypes.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModifyRegistration.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModifyRegistration.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ModifyRegistration.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/NamedString.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/NamedString.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/NamedString.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Online.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Online.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Online.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/OperationFailedFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/OperationFailedFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/OperationFailedFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PerformBlockingInteraction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PerformBlockingInteraction.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PerformBlockingInteraction.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PersonName.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PersonName.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PersonName.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)
@@ -9,24 +32,11 @@
 
 
 /**
- * [R] Handle	portletHandle
- * [R] MarkupType	markupTypes[]
- * [O] ID	groupID
- * [O] LocalizedString	description
- * [O] LocalizedString	shortTitle
- * [O] LocalizedString	title
- * [O] LocalizedString	displayName
- * [O] LocalizedString	keywords[]
- * [O] string	userCategories[]
- * [O] string	userProfileItems[]
- * [O] boolean	usesMethodGet
- * [O] boolean	defaultMarkupSecure
- * [O] boolean	onlySecure
- * [O] boolean	userContextStoredInSession
- * [O] boolean	templatesStoredInSession
- * [O] boolean	hasUserSpecificState
- * [O] boolean	doesUrlTemplateProcessing
- * [O] Extension	extensions
+ * [R] Handle	portletHandle [R] MarkupType	markupTypes[] [O] ID	groupID [O] LocalizedString	description [O]
+ * LocalizedString	shortTitle [O] LocalizedString	title [O] LocalizedString	displayName [O] LocalizedString	keywords[]
+ * [O] string	userCategories[] [O] string	userProfileItems[] [O] boolean	usesMethodGet [O] boolean	defaultMarkupSecure
+ * [O] boolean	onlySecure [O] boolean	userContextStoredInSession [O] boolean	templatesStoredInSession [O]
+ * boolean	hasUserSpecificState [O] boolean	doesUrlTemplateProcessing [O] Extension	extensions
  */
 public class PortletDescription implements Serializable
 {

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescriptionResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescriptionResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletDescriptionResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletPropertyDescriptionResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletPropertyDescriptionResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletPropertyDescriptionResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletStateChangeRequiredFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletStateChangeRequiredFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PortletStateChangeRequiredFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Postal.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Postal.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Postal.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Property.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Property.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Property.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyList.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyList.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/PropertyList.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationData.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationData.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationState.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RegistrationState.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReleaseSessions.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReleaseSessions.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReleaseSessions.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResetProperty.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResetProperty.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResetProperty.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Resource.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Resource.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Resource.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceList.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceList.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceList.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceValue.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceValue.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ResourceValue.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReturnAny.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReturnAny.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ReturnAny.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RuntimeContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RuntimeContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/RuntimeContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ServiceDescription.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ServiceDescription.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/ServiceDescription.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SessionContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SessionContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SessionContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SetPortletProperties.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SetPortletProperties.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/SetPortletProperties.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/StateChange.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/StateChange.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/StateChange.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)
@@ -6,8 +29,8 @@
 package org.jboss.portal.wsrp.core;
 
 
+import java.io.Serializable;
 import java.util.HashMap;
-import java.io.Serializable;
 
 public class StateChange implements Serializable
 {

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Telecom.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Telecom.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Telecom.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/TelephoneNum.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/TelephoneNum.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/TelephoneNum.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Templates.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Templates.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/Templates.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedLocaleFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedLocaleFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedLocaleFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedMimeTypeFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedMimeTypeFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedMimeTypeFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedModeFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedModeFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedModeFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedWindowStateFault.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedWindowStateFault.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UnsupportedWindowStateFault.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UpdateResponse.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UpdateResponse.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UpdateResponse.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UploadContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UploadContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UploadContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserContext.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserContext.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserProfile.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserProfile.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/UserProfile.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRPService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRPService.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRPService.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Markup_PortType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Markup_PortType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Markup_PortType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_PortletManagement_PortType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_PortletManagement_PortType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_PortletManagement_PortType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Registration_PortType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Registration_PortType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_Registration_PortType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_ServiceDescription_PortType.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_ServiceDescription_PortType.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/generated/org/jboss/portal/wsrp/core/WSRP_v1_ServiceDescription_PortType.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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 class was generated by the JAXRPC SI, do not edit.
 // Contents subject to change without notice.
 // JAX-RPC Standard Implementation (1.1.3, build R1)

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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
  *

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

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.wsrp.handler;
 
@@ -61,7 +62,7 @@
    {
       this.headers = mimeHeaders;
    }
-   
+
    public void addAttachmentPart(AttachmentPart attachmentPart)
    {
       throw new UnsupportedOperationException();

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.wsrp.handler;
 
@@ -75,7 +76,7 @@
       ProducerSessionInformation info = new ProducerSessionInformation();
       info.setPerGroupCookies(true);
       String groupId = "group";
-      info.setGroupCookieFor(groupId, new Cookie[] {createCookie("name", "value", 1)});
+      info.setGroupCookieFor(groupId, new Cookie[]{createCookie("name", "value", 1)});
       RequestHeaderClientHandler.setCurrentInfo(null, info);
 
       try
@@ -106,8 +107,8 @@
       ProducerSessionInformation info = new ProducerSessionInformation();
       info.setPerGroupCookies(true);
       String groupId = "group";
-      info.setGroupCookieFor(groupId, new Cookie[] {createCookie("name", "value", 1)});
-      info.setUserCookie(new Cookie[] {createCookie("usercookie", "uservalue", 1)});
+      info.setGroupCookieFor(groupId, new Cookie[]{createCookie("name", "value", 1)});
+      info.setUserCookie(new Cookie[]{createCookie("usercookie", "uservalue", 1)});
       RequestHeaderClientHandler.setCurrentInfo(groupId, info);
 
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/BasicPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/BasicPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/BasicPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.portlet;
 
 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 java.io.IOException;
 
 /**

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/DispatcherPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/DispatcherPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/DispatcherPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.portlet;
 
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletRequestDispatcher;
 import java.io.IOException;
 
 /**

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/GetLocalesPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/GetLocalesPortlet.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/GetLocalesPortlet.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.portlet;
 
 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 java.io.IOException;
 import java.io.PrintWriter;
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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
  *

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/ResponseDebugFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/ResponseDebugFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/ResponseDebugFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp;
 
+import org.jboss.portal.wsrp.core.LocalizedString;
+import org.jboss.portal.wsrp.core.PortletDescription;
 import org.jboss.portal.wsrp.core.ServiceDescription;
-import org.jboss.portal.wsrp.core.PortletDescription;
-import org.jboss.portal.wsrp.core.LocalizedString;
 
 /**
  * Helper class to extract information from WSRP objects in readable manner
@@ -35,6 +36,7 @@
 {
    /**
     * Extracts information from ServiceDescription and puts into StringBuffer object
+    *
     * @param sd
     * @return StringBuffer containing ServiceDescription content
     */
@@ -48,7 +50,6 @@
       }
 
 
-
       buffer.append("# ServiceDescription content:\n");
 
       //TODO: for now only simple property + offered portlets - extend this when needed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.wsrp.deployment;
 
 import org.jboss.deployment.SubDeployerExtMBean;
@@ -31,7 +32,10 @@
 public interface WSRPDeployerMBean extends SubDeployerExtMBean
 {
    FederatingPortletInvoker getFederatingPortletInvoker();
+
    void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker);
+
    String getDefaultWSRPLocation();
+
    void setDefaultWSRPLocation(String defaultWSRPLocation);
 }

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.deployment;
 
 import org.jboss.system.ServiceMBeanSupport;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.wsrp.deployment;
 
 import org.jboss.portal.wsrp.WSRPConstants;
@@ -47,19 +48,13 @@
 public class WSRPDeploymentFactory implements ObjectModelFactory
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static final String WSRP_PRODUCER = "wsrp-producer";
 
-   /**
-    * .
-    */
+   /** . */
    private List properties = new ArrayList();
 
-   /**
-    * .
-    */
+   /** . */
    private static Properties serviceFactoryMapping;
 
    static

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.producer;
 
+import org.apache.log4j.Logger;
 import org.jboss.portal.wsrp.core.AccessDeniedFault;
 import org.jboss.portal.wsrp.core.ClonePortlet;
 import org.jboss.portal.wsrp.core.DestroyPortlets;
@@ -41,7 +43,6 @@
 import org.jboss.portal.wsrp.core.PropertyList;
 import org.jboss.portal.wsrp.core.SetPortletProperties;
 import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType;
-import org.apache.log4j.Logger;
 
 import java.rmi.RemoteException;
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.producer;
 
+import org.apache.log4j.Logger;
 import org.jboss.portal.wsrp.core.InvalidRegistrationFault;
 import org.jboss.portal.wsrp.core.MissingParametersFault;
 import org.jboss.portal.wsrp.core.ModifyRegistration;
@@ -31,7 +33,6 @@
 import org.jboss.portal.wsrp.core.RegistrationState;
 import org.jboss.portal.wsrp.core.ReturnAny;
 import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
-import org.apache.log4j.Logger;
 
 import java.rmi.RemoteException;
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.wsrp.producer;
 
@@ -62,9 +63,7 @@
 
    private final Logger log = Logger.getLogger(getClass());
 
-   /**
-    * The ServiceDescription when the Consumer is allowed to access it or when registration is not required.
-    */
+   /** The ServiceDescription when the Consumer is allowed to access it or when registration is not required. */
    private final ServiceDescription serviceDescription;
 
    ServiceDescriptionHandler(WSRPProducerImpl producer)

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.wsrp.services;
 
 import org.jboss.logging.Logger;
@@ -42,19 +43,13 @@
 public abstract class AbstractJNDIServiceFactory extends AbstractJBossService implements ServiceFactory
 {
 
-   /**
-    * The logger.
-    */
+   /** The logger. */
    protected final Logger log = Logger.getLogger(getClass());
 
-   /**
-    * The JNDI configuration.
-    */
+   /** The JNDI configuration. */
    private Properties env;
 
-   /**
-    * A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service.
-    */
+   /** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */
    protected Properties portJNDIMapping;
 
    protected void createService() throws Exception

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.services;
 
-import java.util.Map;
-
 import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
 
 import javax.xml.rpc.Service;
+import java.util.Map;
 
 /**
- * Perform common logic to soap based service factories. This one cache the service
- * retrieved from the JNDI lookup.
+ * Perform common logic to soap based service factories. This one cache the service retrieved from the JNDI lookup.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -57,11 +56,10 @@
    }
 
    /**
-    * Retrieve the stub from the service. The stub is not thread safe and must be customized
-    * for each thead.
+    * Retrieve the stub from the service. The stub is not thread safe and must be customized for each thead.
     *
     * @param serviceClass the requested service class
-    * @param service the service implementation obtained from the JNDI lookup
+    * @param service      the service implementation obtained from the JNDI lookup
     * @return an implementation based on the provided service
     * @throws Exception
     */

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.services;
 
 import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import org.jboss.portal.common.system.AbstractJBossService;
 
 import java.util.Map;
 
-import org.jboss.portal.common.system.AbstractJBossService;
-
 /**
- * A service factory that statically cache implementations. It is mainly used in
- * the test environment to void the very expensive creation of SOAP service proxies.
+ * A service factory that statically cache implementations. It is mainly used in the test environment to void the very
+ * expensive creation of SOAP service proxies.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.wsrp.services;
 
@@ -157,9 +158,7 @@
       return wsdlReader.readWSDL(new WSDLLocatorImpl(url));
    }
 
-   /**
-    * A WSDLLocator that can handle wsdl imports
-    */
+   /** A WSDLLocator that can handle wsdl imports */
    public static class WSDLLocatorImpl implements WSDLLocator
    {
       private URL wsdlURL;

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/RequestDumperFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/RequestDumperFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/RequestDumperFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.servlet;
 
 import org.jboss.logging.Logger;
 import org.jboss.portal.common.util.Tools;
 
 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;

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

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

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

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/TransactionFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/TransactionFilter.java	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/servlet/TransactionFilter.java	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.wsrp.servlet;
 
+import org.apache.log4j.Logger;
+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.common.transaction.TransactionException;
-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.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
 import java.io.IOException;
 
 /**

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,24 +1,25 @@
-<!--
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the 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's WSRP Remote Producer Configuration deployment descriptor for the *-wsrp.xml files used by Portal to be

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/log4j.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/log4j.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/log4j.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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">
 
 <!-- ===================================================================== -->

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/application-client.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/application-client.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/application-client.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-client 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/application-client_1_4.xsd"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/jboss-client.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/jboss-client.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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>
 
    <!-- Producer interceptor stack -->
@@ -22,7 +45,8 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
       <xmbean/>
-      <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>
       <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Container</depends>
    </mbean>
 
@@ -33,7 +57,8 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=WSRP</depends>
+      <depends optional-attribute-name="Stack"
+               proxy-type="attribute">portal:service=InterceptorStack,type=WSRP</depends>
       <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
    </mbean>
 
@@ -44,7 +69,8 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Stateful</depends>
+      <depends optional-attribute-name="Invoker"
+               proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Stateful</depends>
    </mbean>
 
    <!-- Configure a consumer that is the portal itself -->

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
       <wsrp-producer>

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-web>
    <!--<depends>jboss.ws:service=WebServiceDeployerJSE</depends>-->
 </jboss-web>
\ No newline at end of file

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,17 +1,40 @@
 <?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 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">
 
    <!-- Filter to put request and response in ServletAccess -->
-<!--
+   <!--
+      <filter>
+         <filter-name>RequestDumperFilter</filter-name>
+         <filter-class>org.jboss.portal.wsrp.servlet.RequestDumperFilter</filter-class>
+      </filter>
+   -->
    <filter>
-      <filter-name>RequestDumperFilter</filter-name>
-      <filter-class>org.jboss.portal.wsrp.servlet.RequestDumperFilter</filter-class>
-   </filter>
--->
-   <filter>
       <filter-name>ServletAccessFilter</filter-name>
       <filter-class>org.jboss.portal.wsrp.servlet.ServletAccessFilter</filter-class>
    </filter>
@@ -19,13 +42,13 @@
       <filter-name>TransactionFilter</filter-name>
       <filter-class>org.jboss.portal.wsrp.servlet.TransactionFilter</filter-class>
    </filter>
-<!--
+   <!--
+      <filter-mapping>
+         <filter-name>RequestDumperFilter</filter-name>
+         <url-pattern>/*</url-pattern>
+      </filter-mapping>
+   -->
    <filter-mapping>
-      <filter-name>RequestDumperFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
--->
-   <filter-mapping>
       <filter-name>ServletAccessFilter</filter-name>
       <url-pattern>/*</url-pattern>
    </filter-mapping>

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/webservices.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/webservices.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
              xmlns:impl="urn:oasis:names:tc:wsrp:v1:wsdl"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-basic-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-deployment-lib-jar/test-wsrp.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-deployment-lib-jar/test-wsrp.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-deployment-lib-jar/test-wsrp.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
       <wsrp-producer>

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-dispatcher-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-encodeurl-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-getlocales-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-markup-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-renderparam-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/portlet.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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" version="1.0">

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-session-portlet-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/application-client.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/application-client.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/application-client.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-client 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/application-client_1_4.xsd"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/jboss-client.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/jboss-client.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/wsdl/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-client/META-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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="MBeanServerFactory" 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: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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>
 
    <!-- Dummy test WSRP Producer implementation -->

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-web>
    <depends>jboss.ws:service=WebServiceDeployerJSE</depends>
 </jboss-web>
\ No newline at end of file

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <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"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/webservices.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/webservices.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
              xmlns:impl="urn:oasis:names:tc:wsrp:v1:wsdl"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/wsdl/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-consumer-war/WEB-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/application-client.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/application-client.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/application-client.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-client 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/application-client_1_4.xsd"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/jboss-client.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/jboss-client.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/wsdl/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-client/META-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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>
 
    <!-- Webapp registry -->

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/jboss-web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/jboss-web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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-web>
    <depends>jboss.ws:service=WebServiceDeployerJSE</depends>
 </jboss-web>
\ No newline at end of file

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/web.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/web.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <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"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/webservices.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/webservices.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
              xmlns:impl="urn:oasis:names:tc:wsrp:v1:wsdl"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/wsdl/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/test-wsrp-producer-war/WEB-INF/wsdl/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp-webconfig.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp-webconfig.xml	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp-webconfig.xml	2006-10-13 21:52:24 UTC (rev 5450)
@@ -1,5 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?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.                  ~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
 
 <wsdl location="wsrp_services.wsdl"

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp_services.wsdl
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp_services.wsdl	2006-10-13 21:02:54 UTC (rev 5449)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/webservice/wsrp_services.wsdl	2006-10-13 21:52:24 UTC (rev 5450)
@@ -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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
                   xmlns="http://schemas.xmlsoap.org/wsdl/"