March 2010 - gatein-commits - Jboss List Archives

gatein SVN: r2076 - portal/trunk/docs/user-guide/en/images.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-03-10 00:56:33 -0500 (Wed, 10 Mar 2010) New Revision: 2076 Modified: portal/trunk/docs/user-guide/en/images/AAANavi.png portal/trunk/docs/user-guide/en/images/Account.png portal/trunk/docs/user-guide/en/images/AccountProfiles.png portal/trunk/docs/user-guide/en/images/AccountProfiles3.png portal/trunk/docs/user-guide/en/images/AccountSetting.png portal/trunk/docs/user-guide/en/images/ActionGadget.png portal/trunk/docs/user-guide/en/images/Add.png portal/trunk/docs/user-guide/en/images/Add3.png portal/trunk/docs/user-guide/en/images/AddApplication.png portal/trunk/docs/user-guide/en/images/AddCategory1.png portal/trunk/docs/user-guide/en/images/AddGadgetnew.png portal/trunk/docs/user-guide/en/images/AddGadgetnewUrl.png portal/trunk/docs/user-guide/en/images/AddGroup.png portal/trunk/docs/user-guide/en/images/AddMember1.png portal/trunk/docs/user-guide/en/images/AddNode4.png portal/trunk/docs/user-guide/en/images/AddPermission.png portal/trunk/docs/user-guide/en/images/AddPortal.png portal/trunk/docs/user-guide/en/images/AddPortlet2.png portal/trunk/docs/user-guide/en/images/Admin1.png portal/trunk/docs/user-guide/en/images/Administration.png portal/trunk/docs/user-guide/en/images/AfterEdit1.png portal/trunk/docs/user-guide/en/images/Application1.png portal/trunk/docs/user-guide/en/images/ApplicationRegistry.png portal/trunk/docs/user-guide/en/images/ApplicationRegistry2.png portal/trunk/docs/user-guide/en/images/BannerPortlet.png portal/trunk/docs/user-guide/en/images/Breadcrumbs.png portal/trunk/docs/user-guide/en/images/Calculator.png portal/trunk/docs/user-guide/en/images/Calendar.png portal/trunk/docs/user-guide/en/images/ChangeAccount.png portal/trunk/docs/user-guide/en/images/ChangePassword.png portal/trunk/docs/user-guide/en/images/ChangePortal2.6.png portal/trunk/docs/user-guide/en/images/CloneNode2.png portal/trunk/docs/user-guide/en/images/CodePaste.png portal/trunk/docs/user-guide/en/images/Column.png portal/trunk/docs/user-guide/en/images/ContextMenu1.png portal/trunk/docs/user-guide/en/images/CopyNode3.png portal/trunk/docs/user-guide/en/images/CreateEditNode.png portal/trunk/docs/user-guide/en/images/CreateGadget1.png portal/trunk/docs/user-guide/en/images/CutNode4.png portal/trunk/docs/user-guide/en/images/Dash2.png portal/trunk/docs/user-guide/en/images/Dashboard.png portal/trunk/docs/user-guide/en/images/Dashboard1.png portal/trunk/docs/user-guide/en/images/DashboardLink.png portal/trunk/docs/user-guide/en/images/DashboardPortlet.png portal/trunk/docs/user-guide/en/images/Dashname.png portal/trunk/docs/user-guide/en/images/Dashname1.png portal/trunk/docs/user-guide/en/images/Delete.png portal/trunk/docs/user-guide/en/images/DeleteNode2.png portal/trunk/docs/user-guide/en/images/Demo1.png portal/trunk/docs/user-guide/en/images/Demo3.png portal/trunk/docs/user-guide/en/images/Downloads.png portal/trunk/docs/user-guide/en/images/DragPage1.png portal/trunk/docs/user-guide/en/images/DragPage3.png portal/trunk/docs/user-guide/en/images/Edit.png portal/trunk/docs/user-guide/en/images/Edit2.6.png portal/trunk/docs/user-guide/en/images/EditApplication.png portal/trunk/docs/user-guide/en/images/EditApplicationInformation.png portal/trunk/docs/user-guide/en/images/EditCategoryPermissions.png portal/trunk/docs/user-guide/en/images/EditCurrentPortal.png portal/trunk/docs/user-guide/en/images/EditGroupNavigation.png portal/trunk/docs/user-guide/en/images/EditGroupNavigation2.png portal/trunk/docs/user-guide/en/images/EditInline.png portal/trunk/docs/user-guide/en/images/EditMember1.png portal/trunk/docs/user-guide/en/images/EditNavigation.png portal/trunk/docs/user-guide/en/images/EditNode1.png portal/trunk/docs/user-guide/en/images/EditPermission1.png portal/trunk/docs/user-guide/en/images/EditPermission2.png portal/trunk/docs/user-guide/en/images/EditPortal.png portal/trunk/docs/user-guide/en/images/EditPortal2.6New.png portal/trunk/docs/user-guide/en/images/EditPortalNavigation.png portal/trunk/docs/user-guide/en/images/EditPortalNavigation2.png portal/trunk/docs/user-guide/en/images/EditingArea1.png portal/trunk/docs/user-guide/en/images/EditorPortlet.png portal/trunk/docs/user-guide/en/images/EnterLink.png portal/trunk/docs/user-guide/en/images/FCK1.png portal/trunk/docs/user-guide/en/images/Footer.png portal/trunk/docs/user-guide/en/images/Forgot1.png portal/trunk/docs/user-guide/en/images/ForgotEmail1.png portal/trunk/docs/user-guide/en/images/ForgotUserName1.png portal/trunk/docs/user-guide/en/images/Frontpage.png portal/trunk/docs/user-guide/en/images/GadgetContainer.png portal/trunk/docs/user-guide/en/images/GadgetManagement.png portal/trunk/docs/user-guide/en/images/GadgetManagement1.png portal/trunk/docs/user-guide/en/images/GadgetWrapper.png portal/trunk/docs/user-guide/en/images/Gadgetnew.png portal/trunk/docs/user-guide/en/images/GateIn.png portal/trunk/docs/user-guide/en/images/GoogleGadgets.png portal/trunk/docs/user-guide/en/images/GroupManage.png portal/trunk/docs/user-guide/en/images/GroupPortlet.png portal/trunk/docs/user-guide/en/images/HomePage2.png portal/trunk/docs/user-guide/en/images/In3.png portal/trunk/docs/user-guide/en/images/Inter2.png portal/trunk/docs/user-guide/en/images/InterfaceLanguage.png portal/trunk/docs/user-guide/en/images/InterfaceLanguage2.6.png portal/trunk/docs/user-guide/en/images/Internal2.png portal/trunk/docs/user-guide/en/images/InternationalizationPortlet1.png portal/trunk/docs/user-guide/en/images/Link.png portal/trunk/docs/user-guide/en/images/ManagePage.png portal/trunk/docs/user-guide/en/images/ManagePage2.png portal/trunk/docs/user-guide/en/images/MembershipManage1.png portal/trunk/docs/user-guide/en/images/MoveUpDown.png portal/trunk/docs/user-guide/en/images/NavigationManagement.png portal/trunk/docs/user-guide/en/images/NavigationPortlet.png portal/trunk/docs/user-guide/en/images/NewAccount3.png portal/trunk/docs/user-guide/en/images/NewGadget.png portal/trunk/docs/user-guide/en/images/NewSearch1.png portal/trunk/docs/user-guide/en/images/NewSearch2.png portal/trunk/docs/user-guide/en/images/Nouvel.png portal/trunk/docs/user-guide/en/images/Org1.png portal/trunk/docs/user-guide/en/images/Organization5.png portal/trunk/docs/user-guide/en/images/OrganizationPortlet1.png portal/trunk/docs/user-guide/en/images/PageList.png portal/trunk/docs/user-guide/en/images/PageNodeSetting.png portal/trunk/docs/user-guide/en/images/PageSelector.png portal/trunk/docs/user-guide/en/images/PageSelector6.png portal/trunk/docs/user-guide/en/images/PageSetting.png portal/trunk/docs/user-guide/en/images/PageSetting1.png portal/trunk/docs/user-guide/en/images/PageWizard.png portal/trunk/docs/user-guide/en/images/PageWizard2.png portal/trunk/docs/user-guide/en/images/PageWizard3.png portal/trunk/docs/user-guide/en/images/Pagewizard1.png portal/trunk/docs/user-guide/en/images/PasteCloneNode2.png portal/trunk/docs/user-guide/en/images/PasteCutNode4.png portal/trunk/docs/user-guide/en/images/PasteNode3.png portal/trunk/docs/user-guide/en/images/Permission2.png portal/trunk/docs/user-guide/en/images/PermissionSetting1.png portal/trunk/docs/user-guide/en/images/PermissionSetting2.png portal/trunk/docs/user-guide/en/images/PortalAccessPermissions.png portal/trunk/docs/user-guide/en/images/PortalHome.png portal/trunk/docs/user-guide/en/images/PortalPermission.png portal/trunk/docs/user-guide/en/images/PortalSet.png portal/trunk/docs/user-guide/en/images/PortalSetting2.5.png portal/trunk/docs/user-guide/en/images/PortalTemplate.png portal/trunk/docs/user-guide/en/images/Portlet.png portal/trunk/docs/user-guide/en/images/PortletPermission.png portal/trunk/docs/user-guide/en/images/RSSReader.png portal/trunk/docs/user-guide/en/images/Register.png portal/trunk/docs/user-guide/en/images/RememberMe.png portal/trunk/docs/user-guide/en/images/RememberMe2.6.png portal/trunk/docs/user-guide/en/images/Resource2.png portal/trunk/docs/user-guide/en/images/Resource3.png portal/trunk/docs/user-guide/en/images/ResourceData1.png portal/trunk/docs/user-guide/en/images/Root1.png portal/trunk/docs/user-guide/en/images/Search.png portal/trunk/docs/user-guide/en/images/SearchUser.png portal/trunk/docs/user-guide/en/images/SelectPage1.png portal/trunk/docs/user-guide/en/images/SelectUser.png portal/trunk/docs/user-guide/en/images/SignIn1.png portal/trunk/docs/user-guide/en/images/SignIn2.6.png portal/trunk/docs/user-guide/en/images/SignOut.png portal/trunk/docs/user-guide/en/images/Signin.png portal/trunk/docs/user-guide/en/images/SiteMap.png portal/trunk/docs/user-guide/en/images/SitePortlet.png portal/trunk/docs/user-guide/en/images/Skin1.png portal/trunk/docs/user-guide/en/images/SkinSet1.png portal/trunk/docs/user-guide/en/images/Source.png portal/trunk/docs/user-guide/en/images/StarPortlet.png portal/trunk/docs/user-guide/en/images/Step32.6.png portal/trunk/docs/user-guide/en/images/SureDelete.png portal/trunk/docs/user-guide/en/images/Todo.png portal/trunk/docs/user-guide/en/images/ToolBar1.png portal/trunk/docs/user-guide/en/images/Toolbar.png portal/trunk/docs/user-guide/en/images/UserManage.png portal/trunk/docs/user-guide/en/images/UserProfile.png portal/trunk/docs/user-guide/en/images/UserWorkspace.png portal/trunk/docs/user-guide/en/images/UserWorkspace1.png portal/trunk/docs/user-guide/en/images/UserWorkspace2.png portal/trunk/docs/user-guide/en/images/Videos.png portal/trunk/docs/user-guide/en/images/WebExplorer1.png portal/trunk/docs/user-guide/en/images/Welcome.png portal/trunk/docs/user-guide/en/images/Wizard1.png portal/trunk/docs/user-guide/en/images/XMLURL.png portal/trunk/docs/user-guide/en/images/http.png portal/trunk/docs/user-guide/en/images/local.png Log: Finalised image attributes for both html and pdf builds Modified: portal/trunk/docs/user-guide/en/images/AAANavi.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Account.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AccountProfiles.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AccountProfiles3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AccountSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ActionGadget.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Add.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Add3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddApplication.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddCategory1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddGadgetnew.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddGadgetnewUrl.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddGroup.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddMember1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddNode4.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddPermission.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddPortal.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddPortlet2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Admin1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Administration.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AfterEdit1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Application1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ApplicationRegistry.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ApplicationRegistry2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/BannerPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Breadcrumbs.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Calculator.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Calendar.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ChangeAccount.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ChangePassword.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ChangePortal2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CloneNode2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CodePaste.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Column.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ContextMenu1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CopyNode3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CreateEditNode.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CreateGadget1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CutNode4.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dash2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashboard.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashboard1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DashboardLink.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DashboardPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashname.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashname1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Delete.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DeleteNode2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Demo1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Demo3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Downloads.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DragPage1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DragPage3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Edit.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Edit2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditApplication.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditApplicationInformation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditCategoryPermissions.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditCurrentPortal.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditGroupNavigation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditGroupNavigation2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditInline.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditMember1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditNavigation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditNode1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPermission1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPermission2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortal.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortal2.6New.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortalNavigation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortalNavigation2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditingArea1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditorPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EnterLink.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/FCK1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Footer.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Forgot1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ForgotEmail1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ForgotUserName1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Frontpage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetContainer.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetManagement.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetManagement1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetWrapper.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Gadgetnew.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GateIn.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GoogleGadgets.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GroupManage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GroupPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/HomePage2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/In3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Inter2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/InterfaceLanguage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/InterfaceLanguage2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Internal2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/InternationalizationPortlet1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Link.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ManagePage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ManagePage2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/MembershipManage1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/MoveUpDown.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NavigationManagement.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NavigationPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewAccount3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewGadget.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewSearch1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewSearch2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Nouvel.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Org1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Organization5.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/OrganizationPortlet1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageList.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageNodeSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSelector.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSelector6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSetting1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageWizard.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageWizard2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageWizard3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Pagewizard1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PasteCloneNode2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PasteCutNode4.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PasteNode3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Permission2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PermissionSetting1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PermissionSetting2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalAccessPermissions.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalHome.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalPermission.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalSet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalSetting2.5.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalTemplate.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Portlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortletPermission.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/RSSReader.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Register.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/RememberMe.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/RememberMe2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Resource2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Resource3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ResourceData1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Root1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Search.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SearchUser.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SelectPage1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SelectUser.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SignIn1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SignIn2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SignOut.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Signin.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SiteMap.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SitePortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Skin1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SkinSet1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Source.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/StarPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Step32.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SureDelete.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Todo.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ToolBar1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Toolbar.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserManage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserProfile.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserWorkspace.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserWorkspace1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserWorkspace2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Videos.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/WebExplorer1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Welcome.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Wizard1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/XMLURL.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/http.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/local.png =================================================================== (Binary files differ)

14 years, 9 months

1
0
0 / 0

gatein SVN: r2075 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-03-10 00:49:39 -0500 (Wed, 10 Mar 2010) New Revision: 2075 Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml Log: Finalised image attributes for both html and pdf builds Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2010-03-10 03:41:21 UTC (rev 2074) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2010-03-10 05:49:39 UTC (rev 2075) @@ -32,7 +32,7 @@ </editor> <othercredit> <affiliation> - <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">Jboss Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> Communities</orgname> + <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname> </affiliation> <contrib>Original product documentation by:</contrib> </othercredit>

14 years, 9 months

1
0
0 / 0

gatein SVN: r2074 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-03-09 22:41:21 -0500 (Tue, 09 Mar 2010) New Revision: 2074 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java Log: GTNPORTAL-851: Fix error of redundant node in breadcums portlet Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-10 03:28:32 UTC (rev 2073) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-10 03:41:21 UTC (rev 2074) @@ -300,14 +300,14 @@ for (int i = 1; i < pathNodes.length; i++) { - if (startNode == null) + startNode = startNode.getChild(pathNodes[i]); + if(startNode == null) { break; } else { nodes.add(startNode); - startNode = startNode.getChild(pathNodes[i]); } } return nodes;

14 years, 9 months

1
0
0 / 0

gatein SVN: r2073 - portal/trunk/component/web/src/main/java/org/exoplatform/web/login.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2010-03-09 22:28:32 -0500 (Tue, 09 Mar 2010) New Revision: 2073 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java Log: GTNPORTAL-769 NPE when input invalid URL in portal Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java 2010-03-10 03:17:33 UTC (rev 2072) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java 2010-03-10 03:28:32 UTC (rev 2073) @@ -53,11 +53,13 @@ { log.error("Tried to access the portal login controller without username provided"); resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No username provided"); + return; } if (password == null) { log.error("Tried to access the portal login controller without password provided"); resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No password provided"); + return; } //

14 years, 9 months

1
0
0 / 0

gatein SVN: r2072 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directory.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2010-03-09 22:17:33 -0500 (Tue, 09 Mar 2010) New Revision: 2072 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties Log: GTNPORTAL-850 Should not allow to delete the default portal even to root user Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-03-10 03:01:58 UTC (rev 2071) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-03-10 03:17:33 UTC (rev 2072) @@ -199,9 +199,18 @@ UISiteManagement uicomp = event.getSource(); String portalName = event.getRequestContext().getRequestParameter(OBJECTID); UserPortalConfigService service = event.getSource().getApplicationComponent(UserPortalConfigService.class); + String defaultPortalName = service.getDefaultPortal(); + PortalRequestContext prContext = Util.getPortalRequestContext(); UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); + if (defaultPortalName.equals(portalName)) + { + uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.delete-default-portal", + new String[]{defaultPortalName}, ApplicationMessage.WARNING)); + return; + } + UserPortalConfig config = service.getUserPortalConfig(portalName, prContext.getRemoteUser()); if (config != null && config.getPortalConfig().isModifiable()) { @@ -284,8 +293,8 @@ UIPortal editPortal = uiWorkingWS.createUIComponent(UIPortal.class, null, null); PortalDataMapper.toUIPortal(editPortal, userConfig); - uiEditWS.setUIComponent(editPortal); - + uiEditWS.setUIComponent(editPortal); + if (uiPortal.getName().equals(editPortal.getName())) { editPortal.setSelectedNode(uiPortal.getSelectedNode()); @@ -341,7 +350,7 @@ PageNavigation navi = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName); //Filter the navigation navi = PageNavigationUtils.filterNavigation(navi, context.getRemoteUser(), true); - + uicomp.setSelectedNavigation(navi); UINavigationNodeSelector selector = naviManager.getChild(UINavigationNodeSelector.class); ArrayList<PageNavigation> list = new ArrayList<PageNavigation>(); Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-03-10 03:01:58 UTC (rev 2071) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-03-10 03:17:33 UTC (rev 2072) @@ -1339,6 +1339,7 @@ # org.exoplatform.navigation.webui.component.UISiteManagement # ############################################################################ +UISiteManagement.msg.delete-default-portal=Default portal can not be deleted UISiteManagement.msg.Invalid-deletePermission=This user doesn't have permission to delete this portal UISiteManagement.msg.portal-not-exist=The portal is not existed or may be deleted UISiteManagement.msg.Invalid-editPermission=This user doesn't have permission to edit this portal

14 years, 9 months

1
0
0 / 0

gatein SVN: r2071 - components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-03-09 22:01:58 -0500 (Tue, 09 Mar 2010) New Revision: 2071 Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RenderHandlerTestCase.java Log: - Commented out code that currently doesn't compile anymore. Need more tests here. Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RenderHandlerTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RenderHandlerTestCase.java 2010-03-10 02:55:56 UTC (rev 2070) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RenderHandlerTestCase.java 2010-03-10 03:01:58 UTC (rev 2071) @@ -1,32 +1,33 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2007, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.gatein.wsrp.consumer; import junit.framework.TestCase; -import org.gatein.common.net.URLTools; /** + * todo: FIX-ME! + * * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision: 10507 $ * @since 2.6 @@ -35,11 +36,11 @@ { public void testResourceURLRewriterProcessNonResource() { - String markup = "<a href=\"/portal/portal/default/Test/EXAMPLE/EXAMPLE?action=1d&windowstate=&mode=" + + /*String markup = "<a href=\"/portal/portal/default/Test/EXAMPLE/EXAMPLE?action=1d&windowstate=&mode=" + "&ns=_next%3D%2Fdk%2Fskat%2Fportal%2Ffront%2Fportlets%2Fexample%2Findex.jsp" + "&is=_action%3D%252Fdk%252Fskat%252Fportal%252Ffront%252Fportlets%252Fexample%252FprocessLink" + "%26jbpns_2fdefault_2fTest_2fEXAMPLE_2fEXAMPLEsnpbjname%3DChris\">Press to use default name.</a>"; String result = URLTools.replaceURLsBy(markup, new RenderHandler.ResourceURLRewriter()); - assertEquals(markup, result); + assertEquals(markup, result);*/ } }

14 years, 9 months

1
0
0 / 0

gatein SVN: r2070 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-03-09 21:55:56 -0500 (Tue, 09 Mar 2010) New Revision: 2070 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java Log: - Changed namespace generation algorithm so that it matches the one used locally (and doesn't cause issues in JS). Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java 2010-03-10 02:54:11 UTC (rev 2069) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java 2010-03-10 02:55:56 UTC (rev 2070) @@ -23,13 +23,13 @@ package org.gatein.wsrp.consumer; -import org.gatein.common.net.URLTools; import org.gatein.pc.api.PortletInvokerException; import org.gatein.pc.api.invocation.PortletInvocation; import org.gatein.pc.api.invocation.response.ErrorResponse; import org.gatein.pc.api.invocation.response.PortletInvocationResponse; import org.gatein.pc.api.spi.InstanceContext; import org.gatein.pc.api.spi.WindowContext; +import org.gatein.pc.portlet.impl.jsr168.PortletUtils; import org.oasis.wsrp.v1.InvalidCookie; import org.oasis.wsrp.v1.InvalidRegistration; import org.oasis.wsrp.v1.InvalidSession; @@ -150,7 +150,8 @@ { if (windowContext != null) { - return URLTools.safeEncodeForHTMLId(windowContext.getId()); + // MUST match namespace generation used in PortletResponseImpl.getNamespace in portlet module... + return PortletUtils.generateNamespaceFrom(windowContext.getId()); } return null;

14 years, 9 months

1
0
0 / 0

gatein SVN: r2069 - components/wsrp/trunk/common/src/main/java/org/gatein/wsrp.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-03-09 21:54:11 -0500 (Tue, 09 Mar 2010) New Revision: 2069 Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java Log: - Updated constant values (though they will probably be removed soon). Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java 2010-03-10 02:52:38 UTC (rev 2068) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java 2010-03-10 02:54:11 UTC (rev 2069) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * Copyright 2010, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -176,9 +176,9 @@ /** Encoded version of REWRITE_PARAMETER_CLOSE */ static final String ENC_CLOSE = "%7D"; - /* Constants for Resource URL processing */ - public static final String FAKE_RESOURCE_START = "JBP_RES_REW="; - public static final String FAKE_RESOURCE_REQ_REW = "JBP_REQ_REW"; + /* Constants for Resource URL processing todo: remove? */ + public static final String FAKE_RESOURCE_START = "GTN_RES_REW="; + public static final String FAKE_RESOURCE_REQ_REW = "GTN_REQ_REW"; public static final String FAKE_RESOURCE_URL = FAKE_RESOURCE_START + "{wsrp-url}" + FAKE_RESOURCE_REQ_REW + "{wsrp-requiresRewrite}"; private WSRPRewritingConstants()

14 years, 9 months

1
0
0 / 0

gatein SVN: r2068 - in components/wsrp/trunk: common/src/test/java/org/gatein/wsrp/other and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-03-09 21:52:38 -0500 (Tue, 09 Mar 2010) New Revision: 2068 Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPPortletURL.java components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPResourceURL.java components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/other/WSRPPortletURLTestCase.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java Log: - Rewrote markup processing in RenderHandler so that we can generate URLs that will trigger a ResourceInvocation that can be intercepted by the consumer and proxied (initial work for GTNWSRP-7 & JBPORTAL-2471). - Improved WSRPResourceURL: + Encode resourceURL so that it can safely be sent over the wire when a WSRPResourceURL is output. + Always output a value for wsrp-requiresRewrite. + Added support for resourceId. + Fixed resource test in WSRPPortletURLTestCase. Need to add more. - Updated for move of String manipulation methods to TextTools. Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPPortletURL.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPPortletURL.java 2010-03-10 02:47:11 UTC (rev 2067) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPPortletURL.java 2010-03-10 02:52:38 UTC (rev 2068) @@ -24,7 +24,7 @@ package org.gatein.wsrp; import org.gatein.common.text.FastURLDecoder; -import org.gatein.common.util.Tools; +import org.gatein.common.text.TextTools; import org.gatein.pc.api.ActionURL; import org.gatein.pc.api.ContainerURL; import org.gatein.pc.api.Mode; @@ -126,7 +126,10 @@ public static WSRPPortletURL create(String encodedURL, Set<String> customModes, Set<String> customWindowStates) { - log.debug("Trying to build a WSRPPortletURL from <" + encodedURL + ">"); + if (log.isDebugEnabled()) + { + log.debug("Trying to build a WSRPPortletURL from <" + encodedURL + ">"); + } if (encodedURL == null || encodedURL.length() == 0) { @@ -204,8 +207,8 @@ { throw new IllegalArgumentException(encodedURL + " contains a doubly encoded &!"); } - encodedURL = Tools.replace(encodedURL, ENCODED_AMPERSAND, PARAM_SEPARATOR); - encodedURL = Tools.replace(encodedURL, AMPERSAND, PARAM_SEPARATOR); + encodedURL = TextTools.replace(encodedURL, ENCODED_AMPERSAND, PARAM_SEPARATOR); + encodedURL = TextTools.replace(encodedURL, AMPERSAND, PARAM_SEPARATOR); // remove url type param name and extract value encodedURL = encodedURL.substring(URL_TYPE_END); @@ -223,7 +226,10 @@ } else if (encodedURL.startsWith(WSRPRewritingConstants.URL_TYPE_RESOURCE)) { - log.debug("Using experimental resource URL support..."); + if (log.isDebugEnabled()) + { + log.debug("Using experimental resource URL support..."); + } urlType = WSRPRewritingConstants.URL_TYPE_RESOURCE; url = new WSRPResourceURL(); } Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPResourceURL.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPResourceURL.java 2010-03-10 02:47:11 UTC (rev 2067) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPResourceURL.java 2010-03-10 02:52:38 UTC (rev 2068) @@ -92,13 +92,10 @@ { if (resourceURL != null) { - createURLParameter(sb, WSRPRewritingConstants.RESOURCE_URL, resourceURL.toExternalForm()); + createURLParameter(sb, WSRPRewritingConstants.RESOURCE_URL, URLTools.encodeXWWWFormURL(resourceURL.toExternalForm())); } - if (requiresRewrite) - { - createURLParameter(sb, WSRPRewritingConstants.RESOURCE_REQUIRES_REWRITE, "true"); - } + createURLParameter(sb, WSRPRewritingConstants.RESOURCE_REQUIRES_REWRITE, requiresRewrite ? "true" : "false"); } @Override @@ -123,9 +120,13 @@ { try { + // todo: deal with resourceId properly, right now just use resourceURL if any + resourceId = paramValue; // keep the encoded value as it will be used in URLs + paramValue = URLTools.decodeXWWWFormURL(paramValue); resourceURL = new URL(paramValue); + String extension = URLTools.getFileExtensionOrNullFrom(resourceURL); MediaType mediaType = SUPPORTED_RESOURCE_TYPES.get(extension); @@ -149,11 +150,38 @@ } } + /** + * @return + * @deprecated + */ + public URL getResourceURL() + { + return resourceURL; + } + + /** + * @param resourceURL + * @deprecated + */ + public void setResourceURL(URL resourceURL) + { + this.resourceURL = resourceURL; + } + public String getResourceId() { return resourceId; } + /** + * @param resourceId + * @deprecated + */ + public void setResourceId(String resourceId) + { + this.resourceId = resourceId; + } + public StateString getResourceState() { return resourceState; @@ -196,5 +224,16 @@ { throw new IllegalArgumentException("Malformed URL: " + url, e); } + + log.info("Attempted to build resource URL that could be accessed directly from consumer: " + resourceURL); } + + /** + * @return + * @deprecated + */ + public boolean requiresRewrite() + { + return requiresRewrite; + } } Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2010-03-10 02:47:11 UTC (rev 2067) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2010-03-10 02:52:38 UTC (rev 2068) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * Copyright 2010, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -23,8 +23,8 @@ package org.gatein.wsrp; +import org.gatein.common.text.TextTools; import org.gatein.common.util.ParameterValidation; -import org.gatein.common.util.Tools; import org.gatein.pc.api.ActionURL; import org.gatein.pc.api.Mode; import org.gatein.pc.api.OpaqueStateString; @@ -716,8 +716,8 @@ private static String createTemplate(PortletInvocationContext context, PortletURL url, Boolean secure) { String template = context.renderURL(url, new URLFormat(secure, null, null, true)); - template = Tools.replace(template, WSRPRewritingConstants.ENC_OPEN, WSRPRewritingConstants.REWRITE_PARAMETER_OPEN); - template = Tools.replace(template, WSRPRewritingConstants.ENC_CLOSE, WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + template = TextTools.replace(template, WSRPRewritingConstants.ENC_OPEN, WSRPRewritingConstants.REWRITE_PARAMETER_OPEN); + template = TextTools.replace(template, WSRPRewritingConstants.ENC_CLOSE, WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); return template; } Modified: components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/other/WSRPPortletURLTestCase.java =================================================================== --- components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/other/WSRPPortletURLTestCase.java 2010-03-10 02:47:11 UTC (rev 2067) +++ components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/other/WSRPPortletURLTestCase.java 2010-03-10 02:52:38 UTC (rev 2068) @@ -29,6 +29,7 @@ import org.gatein.wsrp.WSRPActionURL; import org.gatein.wsrp.WSRPPortletURL; import org.gatein.wsrp.WSRPRenderURL; +import org.gatein.wsrp.WSRPResourceURL; import org.gatein.wsrp.WSRPRewritingConstants; import java.util.HashSet; @@ -51,10 +52,13 @@ public void testResource() { String expected = "wsrp_rewrite?wsrp-urlType=resource&wsrp-url=http%3A%2F%2Ftest.com%2Fimages%2Ftest.gif" + - "&wsrp-requiresRewrite=true/wsrp_rewrite"; + "&wsrp-requiresRewrite=false/wsrp_rewrite"; WSRPPortletURL url = WSRPPortletURL.create(expected); - assertEquals("wsrp_rewrite?wsrp-urlType=resource&wsrp-url=http://test.com/images/test.g...", url.toString()); + assertTrue(url instanceof WSRPResourceURL); + WSRPResourceURL resource = (WSRPResourceURL)url; + assertFalse(resource.requiresRewrite()); + assertEquals("http://test.com/images/test.gif", resource.getResourceURL().toExternalForm()); } /** Declare a secure interaction back to the Portlet */ Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-03-10 02:47:11 UTC (rev 2067) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-03-10 02:52:38 UTC (rev 2068) @@ -24,7 +24,8 @@ package org.gatein.wsrp.consumer; import org.gatein.common.net.URLTools; -import org.gatein.common.util.Tools; +import org.gatein.common.text.TextTools; +import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.PortletInvokerException; import org.gatein.pc.api.URLFormat; import org.gatein.pc.api.cache.CacheScope; @@ -51,6 +52,8 @@ import org.oasis.wsrp.v1.UserContext; import javax.xml.ws.Holder; +import java.net.URI; +import java.net.URL; import java.util.List; /** @@ -61,11 +64,7 @@ public class RenderHandler extends InvocationHandler { - /** The separator constant. */ - private static final String SEPARATOR = "_"; - private static final org.gatein.pc.api.cache.CacheControl DEFAULT_CACHE_CONTROL = new org.gatein.pc.api.cache.CacheControl(0, CacheScope.PRIVATE, null); - private static final ResourceURLRewriter RESOURCE_REWRITER = new ResourceURLRewriter(); public RenderHandler(WSRPConsumerImpl consumer) { @@ -183,23 +182,25 @@ throw new IllegalArgumentException("RenderHandler: Request is not a GetMarkup request!"); } - private String processMarkup(String markup, PortletInvocation invocation, boolean rewriteURLs) + private String processMarkup(String markup, PortletInvocation invocation, boolean needsRewriting) { - // fix-me: how to deal with fragment header? => interceptor? - String prefix = getNamespaceFrom(invocation.getWindowContext()); - markup = Tools.replace(markup, WSRPRewritingConstants.WSRP_REWRITE_TOKEN, prefix); - - if (rewriteURLs) + if (needsRewriting) { + // fix-me: how to deal with fragment header? => interceptor? + String prefix = getNamespaceFrom(invocation.getWindowContext()); + markup = TextTools.replace(markup, WSRPRewritingConstants.WSRP_REWRITE_TOKEN, prefix); URLFormat format = new URLFormat(invocation.getSecurityContext().isSecure(), invocation.getSecurityContext().isAuthenticated(), true, true); - WSRPURLRewriter rewriter = new WSRPURLRewriter(invocation.getContext(), format, consumer); - markup = URLTools.replaceURLsBy(markup, rewriter); + + /*WSRPURLRewriter rewriter = new WSRPURLRewriter(invocation.getContext(), format, consumer); + markup = URLTools.replaceURLsBy(markup, rewriter);*/ + + markup = TextTools.replaceBoundedString(markup, WSRPRewritingConstants.BEGIN_WSRP_REWRITE, + WSRPRewritingConstants.END_WSRP_REWRITE, new ResourceURLStringReplacementGenerator(invocation.getContext(), format, consumer), true, false); } - // means that the producer generated the URLs, so handle resources... - return URLTools.replaceURLsBy(markup, RESOURCE_REWRITER); + return markup; } private org.gatein.pc.api.cache.CacheControl createCacheControl(MarkupContext markupContext) @@ -238,69 +239,70 @@ return result; } - private static class WSRPURLRewriter extends URLTools.URLReplacementGenerator + static class ResourceURLStringReplacementGenerator implements TextTools.StringReplacementGenerator { private PortletInvocationContext context; private URLFormat format; private WSRPConsumer consumer; - private static final String SLASH = "/"; - private WSRPURLRewriter(PortletInvocationContext context, URLFormat format, WSRPConsumer consumer) + private ResourceURLStringReplacementGenerator(PortletInvocationContext context, URLFormat format, WSRPConsumer consumer) { this.context = context; this.format = format; this.consumer = consumer; } - public String getReplacementFor(int currentIndex, URLTools.URLMatch currentMatch) + public String getReplacementFor(String match) { - String urlAsString = currentMatch.getURLAsString(); ProducerInfo info = consumer.getProducerInfo(); - if (urlAsString.startsWith(WSRPRewritingConstants.BEGIN_WSRP_REWRITE)) + WSRPPortletURL portletURL = WSRPPortletURL.create(match, info.getSupportedCustomModes(), info.getSupportedCustomWindowStates()); + if (portletURL instanceof WSRPResourceURL) { - WSRPPortletURL portletURL = WSRPPortletURL.create(urlAsString, - info.getSupportedCustomModes(), info.getSupportedCustomWindowStates()); - if (portletURL instanceof WSRPResourceURL) + if (log.isDebugEnabled()) { - log.debug("URL '" + urlAsString + "' seems to refer to a resource which are not currently supported. " + - "Trying to use the raw URL but this probably won't work..."); - return portletURL.toString(); + log.debug("URL '" + match + "' seems to refer to a resource which are not currently well supported."); } - // todo: this is a hack to circumvent frameworks that don't properly request resource encoding (icefaces) - if (urlAsString.startsWith(SLASH)) + WSRPResourceURL resource = (WSRPResourceURL)portletURL; + + // get the parsed URL and add gtnresource to it so that the consumer can know it needs to be intercepted + URL url = resource.getResourceURL(); + try { - return info.getEndpointConfigurationInfo().getRemoteHostAddress() + urlAsString; + String query = url.getQuery(); + if (ParameterValidation.isNullOrEmpty(query)) + { + query = "gtnresource"; + } + else + { + query = "+gtnresource"; + } + URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), + url.getPath(), query, url.getRef()); + + // set the resulting URI as the new resource ID, must be encoded as it will be used in URLs + String s = URLTools.safeEncodeForHTMLId(uri.toString()); + s = s.replace('-', '_'); + resource.setResourceId(s); } + catch (Exception e) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } - return context.renderURL(portletURL, format); - } - return urlAsString; - } - } - static class ResourceURLRewriter extends URLTools.URLReplacementGenerator - { - public String getReplacementFor(int currentIndex, URLTools.URLMatch currentMatch) - { - String urlAsString = currentMatch.getURLAsString(); - String prefix = WSRPRewritingConstants.FAKE_RESOURCE_START; - if (urlAsString.startsWith(prefix)) - { - int index = urlAsString.indexOf(WSRPRewritingConstants.FAKE_RESOURCE_REQ_REW); - String requireRewriteStr = urlAsString.substring(index + WSRPRewritingConstants.FAKE_RESOURCE_REQ_REW.length()); - boolean requireRewrite = Boolean.valueOf(requireRewriteStr); - - urlAsString = urlAsString.substring(prefix.length(), index); - if (requireRewrite) + /*// todo: this is a hack to circumvent frameworks that don't properly request resource encoding (icefaces) + if (resource.getResourceURL().toExternalForm().startsWith(SLASH)) { - // FIX-ME: do something - log.debug("Required re-writing but this is not yet implemented..."); - } - return URLTools.decodeXWWWFormURL(urlAsString); + return info.getEndpointConfigurationInfo().getRemoteHostAddress() + match; + }*/ } - return urlAsString; + + return context.renderURL(portletURL, format); } } + + }

14 years, 9 months

1
0
0 / 0

gatein SVN: r2067 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-03-09 21:47:11 -0500 (Tue, 09 Mar 2010) New Revision: 2067 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java Log: GTNPORTAL-851: Auto-correct node 's wrong URI Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-10 02:44:31 UTC (rev 2066) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-10 02:47:11 UTC (rev 2067) @@ -123,7 +123,6 @@ UIPortal cachedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId); if (cachedUIPortal != null) { -// System.out.println("Found UIPortal with OWNERTYPE: " + newNavType + " OWNERID " + newNavId); cachedUIPortal.setSelectedNode(targetPageNode); cachedUIPortal.setSelectedPath(targetedPathNodes); uiPortalApp.setShowedUIPortal(cachedUIPortal); @@ -180,51 +179,66 @@ String[] pathNodes = targetedUri.split("/"); - //We check the first navigation in the list containing all descendants corresponding to pathNodes - for(PageNavigation nav : allNavs) + return getBestMatchNavigation(allNavs, pathNodes); + } + + /** + * Get the navigation containing longest subpath of 'pathNodes' + * + * @param listNav + * @param pathNodes + * @return + */ + private PageNavigation getBestMatchNavigation(List<PageNavigation> listNav, String[] pathNodes) + { + int temporalMaximalMatching = 0; + PageNavigation temporalBestNavigation = listNav.get(0); + + for(PageNavigation nav : listNav) { - if(containingDescendantNodes(nav, pathNodes)) + int currentNumberOfMatching = countNumberOfMatchedPathNodes(nav, pathNodes); + + //The whole pathNodes matches current navigation + if(currentNumberOfMatching == pathNodes.length) { return nav; } + + if(currentNumberOfMatching > temporalMaximalMatching) + { + temporalMaximalMatching = currentNumberOfMatching; + temporalBestNavigation = nav; + } } - return null; + return temporalBestNavigation; } /** - * Check if a given <code>PageNavigation</code> contains all the descendants corresponding to the pathNodes + * Count the maximal number of nodes matching the pathNodes while descending the navigation 'nav' * - * @param navigation + * @param nav * @param pathNodes * @return */ - private static boolean containingDescendantNodes(PageNavigation navigation, String[] pathNodes) + private int countNumberOfMatchedPathNodes(PageNavigation nav, String[] pathNodes) { - PageNode firstLevelNode = navigation.getNode(pathNodes[0]); - if(firstLevelNode == null) - { - return false; - } - - //Recursive code snippet with two variables - PageNode tempNode = firstLevelNode; - PageNode currentNode; - - for(int i = 1; i < pathNodes.length; i++) - { - currentNode = tempNode.getChild(pathNodes[i]); - - //If the navigation does not support an intermediate pathNode, then returns false - if (currentNode == null) + if(pathNodes.length == 0) + { + return 0; + } + + PageNode currentNode = nav.getNode(pathNodes[0]); + int numberOfMatch = (currentNode != null)? 1 : 0 ; + + for(int i = 1; i < pathNodes.length; i++) + { + if(currentNode == null) { - return false; + break; } - else - { - tempNode = currentNode; - } - } - return true; + currentNode = currentNode.getChild(pathNodes[i]); + } + return numberOfMatch; } /** @@ -244,6 +258,11 @@ } PageNode currentNode = targetedNav.getNode(pathNodes[0]); + if(currentNode == null) + { + return null;//Not found any node here + } + PageNode tempNode = null; for(int i = 1; i < pathNodes.length; i++) @@ -251,7 +270,7 @@ tempNode = currentNode.getChild(pathNodes[i]); if (tempNode == null) { - return null; + break; } else { @@ -281,14 +300,14 @@ for (int i = 1; i < pathNodes.length; i++) { - startNode = startNode.getChild(pathNodes[i]); if (startNode == null) { - return nodes; + break; } else { nodes.add(startNode); + startNode = startNode.getChild(pathNodes[i]); } } return nodes; @@ -309,7 +328,6 @@ UIPortal uiPortal = uiPortalApp.createUIComponent(UIPortal.class, null, null); //Reset selected navigation on userPortalConfig userPortalConfig.setSelectedNavigation(newPageNav); -// System.out.println("Build new UIPortal with OWNERTYPE: " + newPageNav.getOwnerType() + " OWNERID: " + newPageNav.getOwnerId()); PortalDataMapper.toUIPortal(uiPortal, userPortalConfig); return uiPortal; }

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2010