[gatein-commits] gatein SVN: r529 - in portal/trunk: sample and 601 other directories.

Author: trong.tran Date: 2009-11-09 06:58:06 -0500 (Mon, 09 Nov 2009) New Revision: 529 Modified: portal/trunk/ portal/trunk/sample/ portal/trunk/sample/extension/ portal/trunk/sample/extension/config/ portal/trunk/sample/extension/config/src/ portal/trunk/sample/extension/config/src/main/ portal/trunk/sample/extension/config/src/main/java/ portal/trunk/sample/extension/config/src/main/java/conf/ portal/trunk/sample/extension/ear/ portal/trunk/sample/extension/jar/ portal/trunk/sample/extension/jar/src/ portal/trunk/sample/extension/jar/src/main/ portal/trunk/sample/extension/jar/src/main/java/ portal/trunk/sample/extension/jar/src/main/java/org/ portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/ portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/sample/ portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/sample/ext/ portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/sample/ext/web/ portal/trunk/sample/extension/war/ portal/trunk/sample/extension/war/src/ portal/trunk/sample/extension/war/src/main/ portal/trunk/sample/extension/war/src/main/webapp/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/group/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/portal/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/portal/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/web/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/script/ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/script/groovy/ portal/trunk/sample/extension/war/src/main/webapp/login/ portal/trunk/sample/extension/war/src/main/webapp/login/jsp/ portal/trunk/sample/extension/war/src/main/webapp/templates/ portal/trunk/sample/extension/war/src/main/webapp/templates/groovy/ portal/trunk/sample/extension/war/src/main/webapp/templates/groovy/webui/ portal/trunk/sample/extension/war/src/main/webapp/templates/groovy/webui/component/ portal/trunk/sample/extension/war/src/main/webapp/templates/skin/ portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/ portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/ portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/ portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/ portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/background/ portal/trunk/sample/portal/ portal/trunk/sample/portal/config/ portal/trunk/sample/portal/config/src/ portal/trunk/sample/portal/config/src/main/ portal/trunk/sample/portal/config/src/main/java/ portal/trunk/sample/portal/config/src/main/java/conf/ portal/trunk/sample/portal/ear/ portal/trunk/sample/portal/jar/ portal/trunk/sample/portal/jar/src/ portal/trunk/sample/portal/jar/src/main/ portal/trunk/sample/portal/jar/src/main/java/ portal/trunk/sample/portal/jar/src/main/java/org/ portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/ portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/sample/ portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/sample/portal/ portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/sample/portal/web/ portal/trunk/sample/portal/rest-war/ portal/trunk/sample/portal/rest-war/src/ portal/trunk/sample/portal/rest-war/src/main/ portal/trunk/sample/portal/rest-war/src/main/webapp/ portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/ portal/trunk/sample/portal/war/ portal/trunk/sample/portal/war/src/ portal/trunk/sample/portal/war/src/main/ portal/trunk/sample/portal/war/src/main/webapp/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/group/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/portal/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/portal/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/common/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/script/ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/script/groovy/ portal/trunk/sample/portal/war/src/main/webapp/login/ portal/trunk/sample/portal/war/src/main/webapp/login/jsp/ portal/trunk/sample/portal/war/src/main/webapp/login/skin/ portal/trunk/sample/portal/war/src/main/webapp/login/skin/images/ portal/trunk/sample/portal/war/src/main/webapp/templates/ portal/trunk/sample/portal/war/src/main/webapp/templates/groovy/ portal/trunk/sample/portal/war/src/main/webapp/templates/groovy/webui/ portal/trunk/sample/portal/war/src/main/webapp/templates/groovy/webui/component/ portal/trunk/sample/portal/war/src/main/webapp/templates/skin/ portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/ portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/ portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/ portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/ portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/background/ portal/trunk/server/ portal/trunk/server/jboss/ portal/trunk/server/jboss/patch-ear/ portal/trunk/server/jboss/patch-ear/src/ portal/trunk/server/jboss/patch-ear/src/main/ portal/trunk/server/jboss/patch-ear/src/main/jboss/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deployers/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deployers/jbossweb.deployer/ portal/trunk/server/jboss/patch/ portal/trunk/server/jboss/patch/src/ portal/trunk/server/jboss/patch/src/main/ portal/trunk/server/jboss/patch/src/main/jboss/ portal/trunk/server/jboss/patch/src/main/jboss/server/ portal/trunk/server/jboss/patch/src/main/jboss/server/default/ portal/trunk/server/jboss/patch/src/main/jboss/server/default/conf/ portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/ portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/ portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/META-INF/ portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/jboss-web.deployer/ portal/trunk/server/jboss/plugin/ portal/trunk/server/jboss/plugin/src/ portal/trunk/server/jboss/plugin/src/main/ portal/trunk/server/jboss/plugin/src/main/java/ portal/trunk/server/jboss/plugin/src/main/java/conf/ portal/trunk/server/jboss/plugin/src/main/java/conf/portal/ portal/trunk/server/tomcat/ portal/trunk/server/tomcat/patch/ portal/trunk/server/tomcat/patch/src/ portal/trunk/server/tomcat/patch/src/main/ portal/trunk/server/tomcat/patch/src/main/tomcat/ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/ portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/ portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/integration/ portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/integration/META-INF/ portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/integration/WEB-INF/ portal/trunk/server/tomcat/plugin/ portal/trunk/server/tomcat/plugin/src/ portal/trunk/server/tomcat/plugin/src/main/ portal/trunk/server/tomcat/plugin/src/main/java/ portal/trunk/server/tomcat/plugin/src/main/java/conf/ portal/trunk/server/tomcat/plugin/src/main/java/conf/portal/ portal/trunk/starter/ portal/trunk/starter/ear/ portal/trunk/starter/war/ portal/trunk/starter/war/src/ portal/trunk/starter/war/src/main/ portal/trunk/starter/war/src/main/webapp/ portal/trunk/starter/war/src/main/webapp/WEB-INF/ portal/trunk/web/ portal/trunk/web/eXoResources/ portal/trunk/web/eXoResources/src/ portal/trunk/web/eXoResources/src/main/ portal/trunk/web/eXoResources/src/main/resources/ portal/trunk/web/eXoResources/src/main/resources/tomcat/ portal/trunk/web/eXoResources/src/main/resources/tomcat/eXoResources.xml portal/trunk/web/eXoResources/src/main/webapp/ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/conf/ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/lib/ portal/trunk/web/eXoResources/src/main/webapp/javascript/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/html/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/text/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/ portal/trunk/web/eXoResources/src/main/webapp/javascript/html/ portal/trunk/web/eXoResources/src/main/webapp/javascript/html/keyboard/ portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/ portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/UINotification/ portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/UINotification/css/ portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/UINotification/images/ portal/trunk/web/eXoResources/src/main/webapp/skin/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIExoStart/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIExoStart/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIExoStart/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UINotification/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIAccountSettingForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIAccountSettingForm/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeLanguageForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeLanguageForm/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangePortalForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIContainerList/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIContainerList/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIDescription/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPageBrowser/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPageSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPageSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalBrowser/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalSettingForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalSettingForm/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalToolPanel/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalToolPanel/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortletForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UITabContainer/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIWidgets/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIWidgets/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIUserSpace/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIWelcomeComponent/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIWidgetContainerManagement/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIWidgetContainerManagement/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/MiscIcons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/NavigationIcons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/OfficeIcons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/UserIcons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/24x24/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/24x24/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/32x32/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/32x32/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/48x48/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/48x48/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBarStyle/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBarStyle/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBoxDecorator/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBoxDecorator/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIDecorator/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIDecorator/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UICalendar/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UICalendar/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIColorPicker/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UICombobox/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIDescription/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIDropDownControl/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIDropDownControl/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIForm/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormInputDecoratorSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormTabPane/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormWithTitle/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormWithTitle/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGrid/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGrid/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGroupInfoContainer/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGroupInfoContainer/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMouseActionBackground/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMouseActionBackground/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UINotification/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UINotification/images/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPageIterator/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPageIterator/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMenu/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIRightClickPopupMenu/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIQuickHelp/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIQuickHelp/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIFormInputThemeSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIFormInputThemeSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UINodeIconSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UINodeIconSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIPermissionSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIPermissionSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIUserSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabPane/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabSelector/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabSelector/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UIVerticalSlideTabs/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UIVerticalSlideTabs/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIUpload/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIUpload/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/ portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/background/ portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/icons/ portal/trunk/web/eXoResources/src/main/webapp/skin/sharedImages/ portal/trunk/web/eXoResources/src/main/webapp/skin/sharedImages/Icon80x80/ portal/trunk/web/portal/ portal/trunk/web/portal/src/ portal/trunk/web/portal/src/main/ portal/trunk/web/portal/src/main/resources/ portal/trunk/web/portal/src/main/resources/tomcat/ portal/trunk/web/portal/src/main/resources/tomcat/portal.xml portal/trunk/web/portal/src/main/webapp/ portal/trunk/web/portal/src/main/webapp/WEB-INF/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/one-column/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/three-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/two-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/page/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/workspace/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/webui/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/webui/component/ portal/trunk/web/portal/src/main/webapp/WEB-INF/lib/ portal/trunk/web/portal/src/main/webapp/error/ portal/trunk/web/portal/src/main/webapp/error/jsp/ portal/trunk/web/portal/src/main/webapp/error/skin/ portal/trunk/web/portal/src/main/webapp/error/skin/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/classes/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/commandclasses/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/internals/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/css/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/css/behaviors/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/css/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/common/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/common/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_about/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_about/sponsors/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_docprops/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_flash/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_image/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_link/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_select/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_spellerpages/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_spellerpages/spellerpages/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_template/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_template/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dtd/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/images/icons/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/images/icons/32/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/js/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/asp/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/aspx/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/cfm/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/lasso/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/perl/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/php/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/py/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/images/smiley/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/images/smiley/msn/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/js/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/lang/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/autogrow/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/bbcode/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/bbcode/_sample/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/dragresizetable/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/placeholder/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/placeholder/lang/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/simplecommands/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/tablecommands/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/default/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/default/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/office2003/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/office2003/images/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/silver/ portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/silver/images/ portal/trunk/web/portal/src/main/webapp/groovy/ portal/trunk/web/portal/src/main/webapp/groovy/organization/ portal/trunk/web/portal/src/main/webapp/groovy/organization/webui/ portal/trunk/web/portal/src/main/webapp/groovy/organization/webui/component/ portal/trunk/web/portal/src/main/webapp/groovy/portal/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/ portal/trunk/web/portal/src/main/webapp/groovy/webui/ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/ portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/ portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/account/ portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/i18n/ portal/trunk/web/portal/src/main/webapp/login/ portal/trunk/web/portal/src/main/webapp/login/jsp/ portal/trunk/web/portal/src/main/webapp/login/skin/ portal/trunk/web/portal/src/main/webapp/login/skin/images/ portal/trunk/web/portal/src/main/webapp/templates/ portal/trunk/web/portal/src/main/webapp/templates/groovy/ portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/ portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/ portal/trunk/web/portal/src/main/webapp/templates/skin/ portal/trunk/web/portal/src/main/webapp/templates/skin/webui/ portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/ portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/ portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/ portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/background/ portal/trunk/web/rest/ portal/trunk/web/rest/src/ portal/trunk/web/rest/src/main/ portal/trunk/web/rest/src/main/webapp/ portal/trunk/web/rest/src/main/webapp/WEB-INF/ portal/trunk/webui/ portal/trunk/webui/core/ portal/trunk/webui/core/src/ portal/trunk/webui/core/src/main/ portal/trunk/webui/core/src/main/java/ portal/trunk/webui/core/src/main/java/org/ portal/trunk/webui/core/src/main/java/org/exoplatform/ portal/trunk/webui/core/src/main/java/org/exoplatform/web/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/mock/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/bean/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/annotation/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/model/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/event/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/exception/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ext/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/wysiwyg/ portal/trunk/webui/core/src/main/resources/ portal/trunk/webui/core/src/test/ portal/trunk/webui/core/src/test/java/ portal/trunk/webui/core/src/test/java/conf/ portal/trunk/webui/core/src/test/java/conf/portal/ portal/trunk/webui/core/src/test/java/org/ portal/trunk/webui/core/src/test/java/org/exoplatform/ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/ portal/trunk/webui/eXo/ portal/trunk/webui/eXo/src/ portal/trunk/webui/eXo/src/main/ portal/trunk/webui/eXo/src/main/java/ portal/trunk/webui/eXo/src/main/java/conf/ portal/trunk/webui/eXo/src/main/java/org/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/ portal/trunk/webui/eXo/src/test/ portal/trunk/webui/portal/ portal/trunk/webui/portal/src/ portal/trunk/webui/portal/src/main/ portal/trunk/webui/portal/src/main/java/ portal/trunk/webui/portal/src/main/java/conf/ portal/trunk/webui/portal/src/main/java/conf/portal/ portal/trunk/webui/portal/src/main/java/org/ portal/trunk/webui/portal/src/main/java/org/exoplatform/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/util/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/javascript/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/login/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/ 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/UIPageCreationWizard.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/pool/ Log: GTNPORTAL-176 Merge WSRP integration branch ( up to revision 463 ) into trunk Property changes on: portal/trunk ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/config ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/extension/config/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/config/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/config/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/config/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/ear ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/extension/jar ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/sample ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/sample/ext ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/jar/src/main/java/org/exoplatform/sample/ext/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/extension/war/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/navigation/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/classes/locale/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/script ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/script/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/login ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/login/jsp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/groovy/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/groovy/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/extension/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/config ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/portal/config/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/config/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/config/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/config/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/ear ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/portal/jar ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/sample ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/sample/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/jar/src/main/java/org/exoplatform/sample/portal/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/rest-war ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/portal/rest-war/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/rest-war/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/rest-war/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/sample/portal/war/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/navigation/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/classes/locale/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/common ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/script ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/script/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/login ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/login/jsp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/login/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/login/skin/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/groovy/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/groovy/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/sample/portal/war/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server/default ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server/default/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/jboss-web.deployer ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deployers ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deployers/jbossweb.deployer ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/plugin ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/server/jboss/plugin/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/plugin/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/plugin/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/plugin/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/jboss/plugin/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/bin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/webapps ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/integration ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/integration/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/patch/src/main/tomcat/webapps/integration/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/plugin ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/server/tomcat/plugin/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/plugin/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/plugin/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/plugin/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/server/tomcat/plugin/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/starter ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/starter/ear ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/starter/war ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/starter/war/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/starter/war/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/starter/war/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/starter/war/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/resources/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/web/eXoResources/src/main/resources/tomcat/eXoResources.xml =================================================================== --- portal/trunk/web/eXoResources/src/main/resources/tomcat/eXoResources.xml 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/web/eXoResources/src/main/resources/tomcat/eXoResources.xml 2009-11-09 11:58:06 UTC (rev 529) @@ -19,5 +19,5 @@ --> -<Context path="/eXoResources" docBase="../../../eXoProjects/portal/trunk/web/eXoResources/src/main/webapp" +<Context path="/eXoResources" docBase="../../../../../web/eXoResources/src/main/webapp" debug="0" reloadable="true" /> Property changes on: portal/trunk/web/eXoResources/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/lib ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/html ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/text ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/html ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/html/keyboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/UINotification ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/UINotification/css ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/javascript/html/webui/UINotification/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIExoStart ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIExoStart/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIExoStart/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UINotification ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIAccountSettingForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIAccountSettingForm/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeLanguageForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeLanguageForm/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangePortalForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIContainerList ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIContainerList/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIDescription ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPageBrowser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPageSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPageSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalBrowser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalSettingForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalSettingForm/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalToolPanel ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortalToolPanel/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIPortletForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UITabContainer ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIWidgets ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIWidgets/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIUserSpace ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIWelcomeComponent ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIWidgetContainerManagement ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UIWidgetContainerManagement/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/MiscIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/NavigationIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/OfficeIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/UserIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/24x24 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/24x24/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/32x32 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/32x32/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/48x48 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/48x48/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBarStyle ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBarStyle/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBoxDecorator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIBoxDecorator/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIDecorator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIDecorator/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UICalendar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UICalendar/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIColorPicker ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UICombobox ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIDescription ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIDropDownControl ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIDropDownControl/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormInputDecoratorSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormTabPane ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormWithTitle ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIForms/UIFormWithTitle/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGrid ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGrid/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGroupInfoContainer ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIGroupInfoContainer/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMouseActionBackground ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMouseActionBackground/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UINotification ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UINotification/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPageIterator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPageIterator/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMenu ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIRightClickPopupMenu ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIQuickHelp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIQuickHelp/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIFormInputThemeSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIFormInputThemeSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UINodeIconSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UINodeIconSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIPermissionSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIPermissionSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIUserSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabPane ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabSelector ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabSelector/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UIVerticalSlideTabs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UIVerticalSlideTabs/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIUpload ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIUpload/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/sharedImages ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/sharedImages/Icon80x80 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/web/portal/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/resources/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/web/portal/src/main/resources/tomcat/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/resources/tomcat/portal.xml 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/web/portal/src/main/resources/tomcat/portal.xml 2009-11-09 11:58:06 UTC (rev 529) @@ -19,7 +19,7 @@ --> -<Context path="/portal" docBase="../../../../web/portal/src/main/webapp" +<Context path="/portal" docBase="../../../../../web/portal/src/main/webapp" debug="0" reloadable="true" crossContext="true" priviledge="true"> <Logger className="org.apache.catalina.logger.SystemOutLogger" Property changes on: portal/trunk/web/portal/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2009-11-09 11:58:06 UTC (rev 529) @@ -26,7 +26,7 @@ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/portlet-container-configuration.xml</import> - <!--import>war:/conf/common/wsrp-configuration.xml</import--> + <import>war:/conf/common/wsrp-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> <import>war:/conf/database/database-configuration.xml</import> <import>war:/conf/jcr/jcr-configuration.xml</import> Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2009-11-09 11:58:06 UTC (rev 529) @@ -24,105 +24,107 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>war:/conf/jcr/repository-configuration.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="${dialect}"/> - </properties-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="portal-system"/> - </properties-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> - <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> - </component> - - <component> - <key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key> - <type>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</type> - <init-params> - - <value-param> - <name>auto-mix-lockable</name> - <value>false</value> - </value-param> - - <value-param> - <name>def-folder-node-type</name> - <value>nt:folder</value> - </value-param> - - <value-param> - <name>def-file-node-type</name> - <value>nt:file</value> - </value-param> - - <value-param> - <name>def-file-mimetype</name> - <value>text/plain</value> - </value-param> - - <value-param> - <name>update-policy</name> - <value>create-version</value> - </value-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/ext-nodetypes-config.xml</value> - <value>jar:/conf/organization-nodetypes.xml</value> - <value>jar:/conf/standalone/nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>war:/conf/jcr/repository-configuration.xml</value> + </value-param> + <properties-param> + <name>working-conf</name> + <description>working-conf</description> + <property name="persister-class-name" + value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="${dialect}"/> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> + + <component> + <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> + <init-params> + <properties-param> + <name>locations</name> + <property name="repository" value="portal-system"/> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> + </component> + + <component> + <key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key> + <type>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</type> + <init-params> + + <value-param> + <name>auto-mix-lockable</name> + <value>false</value> + </value-param> + + <value-param> + <name>def-folder-node-type</name> + <value>nt:folder</value> + </value-param> + + <value-param> + <name>def-file-node-type</name> + <value>nt:file</value> + </value-param> + + <value-param> + <name>def-file-mimetype</name> + <value>text/plain</value> + </value-param> + + <value-param> + <name>update-policy</name> + <value>create-version</value> + </value-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="dc" value="http://purl.org/dc/elements/1.1/"/> + <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/ext-nodetypes-config.xml</value> + <value>jar:/conf/organization-nodetypes.xml</value> + <value>jar:/conf/standalone/nodetypes.xml</value> + <value>jar:/conf/portal/content-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + </configuration> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-11-09 11:58:06 UTC (rev 529) @@ -24,104 +24,106 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>war:/conf/jcr/repository-configuration.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - </properties-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="portal-system"/> - </properties-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> - <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> - </component> - - <component> - <key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key> - <type>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</type> - <init-params> - - <value-param> - <name>auto-mix-lockable</name> - <value>false</value> - </value-param> - - <value-param> - <name>def-folder-node-type</name> - <value>nt:folder</value> - </value-param> - - <value-param> - <name>def-file-node-type</name> - <value>nt:file</value> - </value-param> - - <value-param> - <name>def-file-mimetype</name> - <value>text/plain</value> - </value-param> - - <value-param> - <name>update-policy</name> - <value>create-version</value> - </value-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/ext-nodetypes-config.xml</value> - <value>jar:/conf/organization-nodetypes.xml</value> - <value>jar:/conf/standalone/nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>war:/conf/jcr/repository-configuration.xml</value> + </value-param> + <properties-param> + <name>working-conf</name> + <description>working-conf</description> + <property name="persister-class-name" + value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> + + <component> + <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> + <init-params> + <properties-param> + <name>locations</name> + <property name="repository" value="portal-system"/> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> + </component> + + <component> + <key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key> + <type>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</type> + <init-params> + + <value-param> + <name>auto-mix-lockable</name> + <value>false</value> + </value-param> + + <value-param> + <name>def-folder-node-type</name> + <value>nt:folder</value> + </value-param> + + <value-param> + <name>def-file-node-type</name> + <value>nt:file</value> + </value-param> + + <value-param> + <name>def-file-mimetype</name> + <value>text/plain</value> + </value-param> + + <value-param> + <name>update-policy</name> + <value>create-version</value> + </value-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="dc" value="http://purl.org/dc/elements/1.1/"/> + <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/ext-nodetypes-config.xml</value> + <value>jar:/conf/organization-nodetypes.xml</value> + <value>jar:/conf/standalone/nodetypes.xml</value> + <value>jar:/conf/portal/content-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-11-09 11:58:06 UTC (rev 529) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2009 eXo Platform SAS. @@ -19,318 +19,512 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.application.gadget.GadgetRegistryService</key> + <type>org.exoplatform.application.gadget.jcr.GadgetRegistryServiceImpl</type> + <init-params> + <value-param> + <name>gadgets.country</name> + <description>US</description> + <value>US</value> + </value-param> - <component> - <key>org.exoplatform.application.gadget.GadgetRegistryService</key> - <type>org.exoplatform.application.gadget.jcr.GadgetRegistryServiceImpl</type> - <init-params> - <value-param> - <name>gadgets.country</name> - <description>US</description> - <value>US</value> - </value-param> - - <value-param> - <name>gadgets.language</name> - <description>en</description> - <value>en</value> - </value-param> - - <value-param> - <name>gadgets.moduleId</name> - <description>0</description> - <value>0</value> - </value-param> - - <value-param> - <name>gadgets.hostName</name> - <description>Gadget server url</description> - <value>eXoGadgetServer/gadgets</value> - </value-param> - - <properties-param> - <name>developerInfo</name> - <description>The group that is allowed to develop gadgets</description> - <property name="developer.group" value="/platform/administrators"></property> - </properties-param> - </init-params> - </component> + <value-param> + <name>gadgets.language</name> + <description>en</description> + <value>en</value> + </value-param> - <component> - <key>org.exoplatform.application.gadget.SourceStorage</key> - <type>org.exoplatform.application.gadget.jcr.SourceStorageImpl</type> - <init-params> - <properties-param> - <name>location</name> - <description>The location store source of gadgets</description> - <property name="repository" value="repository"></property> - <property name="workspace" value="gadgets"></property> - <property name="store.path" value="/"></property> - </properties-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.application.registry.ApplicationRegistryService</key> - <type>org.exoplatform.application.registry.jcr.ApplicationRegistryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>new.portal.portlets.registry</name> - <set-method>initListener</set-method> - <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type> - <description>this listener init the portlets are registered in PortletRegister</description> - <init-params> - <object-param> - <name>administration</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>Administration</string></field> - <field name="displayName"><string>Administration</string></field> - <field name="description"><string>application for administration</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"><string>ApplicationRegistryPortlet</string></field> - <field name="categoryName"><string>administration</string></field> - <field name="displayName"><string>Application Registry</string></field> - <field name="description"><string>Application Registry</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>exoadmin</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"><string>OrganizationPortlet</string></field> - <field name="categoryName"><string>administration</string></field> - <field name="displayName"><string>Organization Management</string></field> - <field name="description"><string>Organization Management</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>exoadmin</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"><string>AccountPortlet</string></field> - <field name="categoryName"><string>administration</string></field> - <field name="displayName"><string>New Account</string></field> - <field name="description"><string>New Account</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>exoadmin</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - - <object-param> - <name>web</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>web</string></field> - <field name="displayName"><string>web</string></field> - <field name="description"><string>BasicPortlets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>web</string></field> - <field name="applicationName"><string>IFramePortlet</string></field> - <field name="displayName"><string>IFrame</string></field> - <field name="description"><string>IFrame</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>web</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>web</string></field> - <field name="applicationName"><string>SiteMapPortlet</string></field> - <field name="displayName"><string>SiteMap</string></field> - <field name="description"><string>SiteMap</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>web</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - - <object-param> - <name>dashboard</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>dashboard</string></field> - <field name="displayName"><string>Dashboard</string></field> - <field name="description"><string>Dashboard</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>dashboard</string></field> - <field name="applicationName"><string>DashboardPortlet</string></field> - <field name="displayName"><string>Dashboard Portlet</string></field> - <field name="description"><string>Dashboard Portlet</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>dashboard</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>dashboard</string></field> - <field name="applicationName"><string>GadgetPortlet</string></field> - <field name="displayName"><string>Gadget Wrapper Portlet</string></field> - <field name="description"><string>Gadget Wrapper Portlet</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>dashboard</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - - <object-param> - <name>eXoGadgets</name> - <description>Gadgets</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>eXoGadgets</string></field> - <field name="displayName"><string>Gadgets</string></field> - <field name="description"><string>Gadgets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>eXoGadgets</string></field> - <field name="applicationName"><string>Todo</string></field> - <field name="displayName"><string>Todo</string></field> - <field name="description"><string>ToDo Gadget, easily manage and track your daily to-do list.</string></field> - <field name="applicationType"><string>eXoGadget</string></field> - <field name="applicationGroup"><string>eXoGadgets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>eXoGadgets</string></field> - <field name="applicationName"><string>Calendar</string></field> - <field name="displayName"><string>Calendar</string></field> - <field name="description"><string>What date is it? Use this cool calendar to keep track of the date in style. You can switch easily between daily, monthly or yearly view.</string></field> - <field name="applicationType"><string>eXoGadget</string></field> - <field name="applicationGroup"><string>eXoGadgets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>eXoGadgets</string></field> - <field name="applicationName"><string>Calculator</string></field> - <field name="displayName"><string>Calculator</string></field> - <field name="description"><string>This simple and useful calculator lets you perform most of the basic arithmetic operations.</string></field> - <field name="applicationType"><string>eXoGadget</string></field> - <field name="applicationGroup"><string>eXoGadgets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>eXoGadgets</string></field> - <field name="applicationName"><string>rssAggregator</string></field> - <field name="displayName"><string>Rss Reader</string></field> - <field name="description"><string>Rss Reader</string></field> - <field name="applicationType"><string>eXoGadget</string></field> - <field name="applicationGroup"><string>eXoGadgets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </component-plugins> - </component> + <value-param> + <name>gadgets.moduleId</name> + <description>0</description> + <value>0</value> + </value-param> + + <value-param> + <name>gadgets.hostName</name> + <description>Gadget server url</description> + <value>eXoGadgetServer/gadgets</value> + </value-param> + + <properties-param> + <name>developerInfo</name> + <description>The group that is allowed to develop gadgets</description> + <property name="developer.group" value="/platform/administrators"/> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.application.gadget.SourceStorage</key> + <type>org.exoplatform.application.gadget.jcr.SourceStorageImpl</type> + <init-params> + <properties-param> + <name>location</name> + <description>The location store source of gadgets</description> + <property name="repository" value="repository"/> + <property name="workspace" value="gadgets"/> + <property name="store.path" value="/"/> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.application.registry.ApplicationRegistryService</key> + <type>org.exoplatform.application.registry.jcr.ApplicationRegistryServiceImpl</type> + <component-plugins> + <component-plugin> + <name>new.portal.portlets.registry</name> + <set-method>initListener</set-method> + <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type> + <description>this listener init the portlets are registered in PortletRegister</description> + <init-params> + <object-param> + <name>administration</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"> + <string>Administration</string> + </field> + <field name="displayName"> + <string>Administration</string> + </field> + <field name="description"> + <string>application for administration</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/administrators</string> + </value> + <value> + <string>*:/organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"> + <string>ApplicationRegistryPortlet</string> + </field> + <field name="categoryName"> + <string>administration</string> + </field> + <field name="displayName"> + <string>Application Registry</string> + </field> + <field name="description"> + <string>Application Registry</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>exoadmin</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/administrators</string> + </value> + <value> + <string>*:/organization/management/executive-board</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"> + <string>OrganizationPortlet</string> + </field> + <field name="categoryName"> + <string>administration</string> + </field> + <field name="displayName"> + <string>Organization Management</string> + </field> + <field name="description"> + <string>Organization Management</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>exoadmin</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/administrators</string> + </value> + <value> + <string>*:/organization/management/executive-board</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"> + <string>AccountPortlet</string> + </field> + <field name="categoryName"> + <string>administration</string> + </field> + <field name="displayName"> + <string>New Account</string> + </field> + <field name="description"> + <string>New Account</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>exoadmin</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/administrators</string> + </value> + <value> + <string>*:/organization/management/executive-board</string> + </value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + + <object-param> + <name>web</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"> + <string>web</string> + </field> + <field name="displayName"> + <string>web</string> + </field> + <field name="description"> + <string>BasicPortlets</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>web</string> + </field> + <field name="applicationName"> + <string>IFramePortlet</string> + </field> + <field name="displayName"> + <string>IFrame</string> + </field> + <field name="description"> + <string>IFrame</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>web</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>web</string> + </field> + <field name="applicationName"> + <string>SiteMapPortlet</string> + </field> + <field name="displayName"> + <string>SiteMap</string> + </field> + <field name="description"> + <string>SiteMap</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>web</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + + <object-param> + <name>dashboard</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"> + <string>dashboard</string> + </field> + <field name="displayName"> + <string>Dashboard</string> + </field> + <field name="description"> + <string>Dashboard</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>dashboard</string> + </field> + <field name="applicationName"> + <string>DashboardPortlet</string> + </field> + <field name="displayName"> + <string>Dashboard Portlet</string> + </field> + <field name="description"> + <string>Dashboard Portlet</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>dashboard</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>dashboard</string> + </field> + <field name="applicationName"> + <string>GadgetPortlet</string> + </field> + <field name="displayName"> + <string>Gadget Wrapper Portlet</string> + </field> + <field name="description"> + <string>Gadget Wrapper Portlet</string> + </field> + <field name="applicationType"> + <string>portlet</string> + </field> + <field name="applicationGroup"> + <string>dashboard</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + + <object-param> + <name>eXoGadgets</name> + <description>Gadgets</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"> + <string>eXoGadgets</string> + </field> + <field name="displayName"> + <string>Gadgets</string> + </field> + <field name="description"> + <string>Gadgets</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>eXoGadgets</string> + </field> + <field name="applicationName"> + <string>Todo</string> + </field> + <field name="displayName"> + <string>Todo</string> + </field> + <field name="description"> + <string>ToDo Gadget, easily manage and track your daily to-do list.</string> + </field> + <field name="applicationType"> + <string>eXoGadget</string> + </field> + <field name="applicationGroup"> + <string>eXoGadgets</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>eXoGadgets</string> + </field> + <field name="applicationName"> + <string>Calendar</string> + </field> + <field name="displayName"> + <string>Calendar</string> + </field> + <field name="description"> + <string>What date is it? Use this cool calendar to keep track of the date in style. + You can switch easily between daily, monthly or yearly view. + </string> + </field> + <field name="applicationType"> + <string>eXoGadget</string> + </field> + <field name="applicationGroup"> + <string>eXoGadgets</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>eXoGadgets</string> + </field> + <field name="applicationName"> + <string>Calculator</string> + </field> + <field name="displayName"> + <string>Calculator</string> + </field> + <field name="description"> + <string>This simple and useful calculator lets you perform most of the basic + arithmetic operations. + </string> + </field> + <field name="applicationType"> + <string>eXoGadget</string> + </field> + <field name="applicationGroup"> + <string>eXoGadgets</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"> + <string>eXoGadgets</string> + </field> + <field name="applicationName"> + <string>rssAggregator</string> + </field> + <field name="displayName"> + <string>Rss Reader</string> + </field> + <field name="description"> + <string>Rss Reader</string> + </field> + <field name="applicationType"> + <string>eXoGadget</string> + </field> + <field name="applicationGroup"> + <string>eXoGadgets</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/users</string> + </value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </component-plugins> + </component> </configuration> \ No newline at end of file Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/one-column ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/three-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/page ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/workspace ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/WEB-INF/lib ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/error ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/error/jsp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/error/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/error/skin/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/commandclasses ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/_source/internals ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/css ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/css/behaviors ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/css/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/common ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/common/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_about ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_about/sponsors ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_docprops ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_flash ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_image ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_link ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_select ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_spellerpages ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_spellerpages/spellerpages ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dialog/fck_template/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/dtd ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/images/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/images/icons/32 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/browser/default/js ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/asp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/aspx ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/cfm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/lasso ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/perl ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/php ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/filemanager/connectors/py ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/images/smiley ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/images/smiley/msn ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/js ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/lang ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/autogrow ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/bbcode ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/bbcode/_sample ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/dragresizetable ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/placeholder ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/placeholder/lang ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/simplecommands ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/plugins/tablecommands ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/default ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/default/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/office2003 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/office2003/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/silver ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/fckeditor/editor/skins/silver/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/organization/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/organization/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui/core ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui/form ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/i18n ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/login ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/login/jsp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/login/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/login/skin/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/groovy/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/skin/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/rest ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/web/rest/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/rest/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/rest/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/web/rest/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/webui/core/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/mock ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/bean ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/annotation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -36,11 +36,7 @@ import org.exoplatform.webui.form.UIFormMultiValueInputSet; import org.exoplatform.webui.form.validator.Validator; -/** - * Author : Nhu Dinh Thuan - * nhudinhthuan(a)yahoo.com - * Jun 1, 2006 - */ +/** Author : Nhu Dinh Thuan nhudinhthuan(a)yahoo.com Jun 1, 2006 */ public class UIFormLifecycle extends Lifecycle<UIForm> { @@ -64,31 +60,43 @@ { Event<UIComponent> event = uicomponent.createEvent(action, Event.Phase.DECODE, context); if (event != null) + { event.broadcast(); + } return; } UIComponent uiSubComponent = uicomponent.findComponentById(subComponentId); Event<UIComponent> event = uiSubComponent.createEvent(action, Event.Phase.DECODE, context); if (event == null) - event = uicomponent.createEvent(action, Event.Phase.DECODE, context); + { + event = uicomponent.createEvent(action, Event.Phase.DECODE, context); + } if (event != null) + { event.broadcast(); + } } public void processAction(UIForm uicomponent, WebuiRequestContext context) throws Exception { String action = context.getRequestParameter(UIForm.ACTION); if (action == null) + { action = uicomponent.getSubmitAction(); + } if (action == null) + { return; + } Event<UIComponent> event = uicomponent.createEvent(action, Event.Phase.PROCESS, context); if (event == null) { - event = uicomponent.<UIComponent> getParent().createEvent(action, Event.Phase.PROCESS, context); + event = uicomponent.<UIComponent>getParent().createEvent(action, Event.Phase.PROCESS, context); } if (event == null) + { return; + } UIApplication uiApp = uicomponent.getAncestorOfType(UIApplication.class); List<UIComponent> children = uicomponent.getChildren(); validateChildren(children, uiApp, context); @@ -123,7 +131,9 @@ for (UIFormInputBase input : inputs) { if (!input.isValid()) + { continue; + } String inputValue = context.getRequestParameter(input.getId()); if (inputValue == null || inputValue.trim().length() == 0) { @@ -169,14 +179,20 @@ { UIFormInputBase uiInput = (UIFormInputBase)uiChild; if (!uiInput.isValid()) + { continue; + } List<Validator> validators = uiInput.getValidators(); if (validators == null) + { continue; + } try { for (Validator validator : validators) + { validator.validate(uiInput); + } } catch (MessageException ex) { @@ -200,7 +216,9 @@ UIFormMultiValueInputSet uiInput = (UIFormMultiValueInputSet)uiChild; List<Validator> validators = uiInput.getValidators(); if (validators == null) + { continue; + } try { for (Validator validator : validators) @@ -232,11 +250,15 @@ UIFormInputContainer uiInput = (UIFormInputContainer)uiChild; List<Validator> validators = uiInput.getValidators(); if (validators == null) + { continue; + } try { for (Validator validator : validators) + { validator.validate(uiInput); + } } catch (MessageException ex) { Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/model ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/event ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/exception ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ext ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/wysiwyg ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java/org/exoplatform/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/webui/eXo/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -37,8 +37,8 @@ import org.exoplatform.webui.core.UIPageIterator; import org.exoplatform.webui.core.UITree; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.exception.MessageException; import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormCheckBoxInput; @@ -48,13 +48,8 @@ import org.exoplatform.webui.form.UIFormPopupWindow; import org.exoplatform.webui.form.validator.Validator; -/** - * Created by The eXo Platform SARL - * Author : Pham Dung Ha - * ha.pham(a)exoplatform.com - * May 7, 2007o - */ -@ComponentConfig(template = "system:/groovy/organization/webui/component/UIListPermissionSelector.gtmpl", events = { +/** Created by The eXo Platform SARL Author : Pham Dung Ha ha.pham(a)exoplatform.com May 7, 2007o */ +@ComponentConfig(template = "system:/groovy/organization/webui/component/UIListPermissionSelector.gtmpl", events = { @EventConfig(phase = Phase.DECODE, listeners = UIListPermissionSelector.DeleteActionListener.class, confirm = "UIAccessGroup.deleteAccessGroup"), @EventConfig(phase = Phase.DECODE, listeners = UIPermissionSelector.SelectMembershipActionListener.class), @EventConfig(phase = Phase.DECODE, listeners = UIListPermissionSelector.ChangePublicModeActionListener.class)}) @@ -102,7 +97,9 @@ { Permission per = (Permission)ele; if (per.getExpression().equals(permission.getExpression())) + { return true; + } } return false; } @@ -118,7 +115,9 @@ public String[] getValue() throws Exception { if (publicMode_) + { return new String[]{UserACL.EVERYONE}; + } UIPageIterator uiIterator = getChild(UIGrid.class).getUIPageIterator(); List<Object> values = uiIterator.getPageList().getAll(); String[] expPermissions = new String[values.size()]; @@ -144,11 +143,15 @@ break; } if (exp.trim().length() < 1) + { continue; + } Permission permission = new Permission(); permission.setPermissionExpression(exp); if (existsPermission(list, permission)) + { continue; + } list.add(permission); } UIPageIterator uiIterator = getChild(UIGrid.class).getUIPageIterator(); @@ -178,7 +181,9 @@ public void setMembership(String groupId, String membershipType) throws Exception { if (groupId.trim().length() < 1 || membershipType.trim().length() < 1) + { return; + } Permission permission = new Permission(); permission.setExpression(membershipType + ":" + groupId); permission.setGroupId(groupId); @@ -187,7 +192,9 @@ UIPageIterator uiIterator = getChild(UIGrid.class).getUIPageIterator(); list.addAll(uiIterator.getPageList().getAll()); if (existsPermission(list, permission)) + { return; + } list.add(permission); uiIterator.setPageList(new LazyPageList(new AccessGroupListAccess(list), 10)); } @@ -227,7 +234,9 @@ UIFormGrid uiGrid = getChild(UIFormGrid.class); uiGrid.setRendered(!publicMode_); if (publicMode_) + { uiGrid.getUIPageIterator().setPageList(new LazyPageList(new AccessGroupListAccess(null), 10)); + } } static public class DeleteActionListener extends EventListener<UIListPermissionSelector> @@ -244,7 +253,9 @@ UIForm uiForm = uiPermissions.getAncestorOfType(UIForm.class); uiForm.broadcast(event, event.getExecutionPhase()); while (currentPage > pageIterator.getAvailablePage()) + { currentPage--; + } pageIterator.setCurrentPage(currentPage); event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent()); } @@ -268,7 +279,9 @@ UIForm uiForm = uicom.getAncestorOfType(UIForm.class); UIPermissionSelector uiPermission = uiForm.findFirstComponentOfType(UIPermissionSelector.class); if (uiPermission != null) + { uiPermission.setRendered(false); + } if (uiForm != null) { uiForm.broadcast(event, event.getExecutionPhase()); @@ -285,7 +298,9 @@ { UIListPermissionSelector uiInputContainer = (UIListPermissionSelector)uiInput; if (uiInputContainer.isPublicMode()) + { return; + } UIFormPageIterator uiInputIterator = uiInputContainer.findFirstComponentOfType(UIFormPageIterator.class); if (uiInputIterator.getAvailable() < 1) { Property changes on: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/eXo/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/webui/portal/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -38,6 +38,8 @@ import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.core.lifecycle.HtmlValidator; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.io.Writer; @@ -48,12 +50,9 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * This class extends the abstract WebuiRequestContext which itself extends the RequestContext one - * + * <p/> * It mainly implements the abstract methods and overide some. */ public class PortalRequestContext extends WebuiRequestContext @@ -114,24 +113,34 @@ ajaxRequest_ = "true".equals(req.getParameter("ajaxRequest")); String cache = req.getParameter(CACHE_LEVEL); if (cache != null) + { cacheLevel_ = cache; + } requestURI_ = URLDecoder.decode(req.getRequestURI(), "UTF-8"); String pathInfo = req.getPathInfo(); if (pathInfo == null) + { pathInfo = "/"; + } int colonIndex = pathInfo.indexOf("/", 1); if (colonIndex < 0) + { colonIndex = pathInfo.length(); + } portalOwner_ = pathInfo.substring(1, colonIndex); nodePath_ = pathInfo.substring(colonIndex, pathInfo.length()); portalURI = requestURI_.substring(0, requestURI_.lastIndexOf(nodePath_)) + "/"; if (requestURI_.indexOf("/public/") >= 0) + { accessPath = PUBLIC_ACCESS; + } else if (requestURI_.indexOf("/private/") >= 0) + { accessPath = PRIVATE_ACCESS; + } //TODO use the encoding from the locale-config.xml file response_.setContentType("text/html; charset=UTF-8"); @@ -156,7 +165,9 @@ { String title = (String)request_.getAttribute(REQUEST_TITLE); if (title != null) + { return title; + } UIPortal uiportal = Util.getUIPortal(); String resolvedLabel = (uiportal.getSelectedNode() == null) ? null : uiportal.getSelectedNode().getResolvedLabel(); @@ -199,9 +210,8 @@ Map<String, String[]> unsortedParams = getRequest().getParameterMap(); Map<String, String[]> sortedParams = new HashMap<String, String[]>(); Set<String> keys = unsortedParams.keySet(); - for (Iterator<String> iter = keys.iterator(); iter.hasNext();) + for (String key : keys) { - String key = iter.next(); if (!key.startsWith(Constants.PARAMETER_ENCODER)) { sortedParams.put(key, unsortedParams.get(key)); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -34,29 +34,26 @@ import org.exoplatform.webui.application.portlet.PortletRequestContext; import org.exoplatform.webui.core.UIApplication; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.util.Enumeration; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - public class PortalStateManager extends StateManager { protected static Log log = ExoLogger.getLogger("portal:PortalStateManager"); - /** ConcurrentMap<SessionId, HashMap<PortalName, PortalApplicationState>> **/ + /** ConcurrentMap<SessionId, HashMap<PortalName, PortalApplicationState>> * */ private ConcurrentMap<String, HashMap<String, PortalApplicationState>> uiApplications = new ConcurrentHashMap<String, HashMap<String, PortalApplicationState>>(); /** - * This method is used to restore the UI component tree either the current request targets a portlet - * or the portal. - * - * In both cases, if the tree is not stored already it is created and then stored in a local Map - * + * This method is used to restore the UI component tree either the current request targets a portlet or the portal. + * <p/> + * In both cases, if the tree is not stored already it is created and then stored in a local Map */ @SuppressWarnings("unchecked") public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception @@ -71,13 +68,15 @@ */ if (context instanceof PortletRequestContext) { - WebuiRequestContext preqContext = (WebuiRequestContext)context.getParentAppRequestContext(); + WebuiRequestContext preqContext = (WebuiRequestContext)context.getParentAppRequestContext(); PortletRequestContext pcontext = (PortletRequestContext)context; String key = pcontext.getApplication().getApplicationId() + "/" + pcontext.getWindowId(); PortalApplicationState state = getApplicationState(preqContext); UIApplication uiApplication = state.get(key); if (uiApplication != null) + { return uiApplication; + } ConfigurationManager cmanager = app.getConfigurationManager(); String uirootClass = cmanager.getApplication().getUIRootComponent(); Class type = Thread.currentThread().getContextClassLoader().loadClass(uirootClass); @@ -119,7 +118,7 @@ pcontext.setAttribute(UserPortalConfig.class, config); UIPortalApplication uiApplication = (UIPortalApplication)app.createUIComponent(type, null, null, context); state = new PortalApplicationState(uiApplication, pcontext.getRemoteUser()); - cacheApplicationState(pcontext.getSessionId(), pcontext.getPortalOwner(),state); + cacheApplicationState(pcontext.getSessionId(), pcontext.getPortalOwner(), state); SessionManagerContainer pcontainer = (SessionManagerContainer)app.getApplicationServiceContainer(); pcontainer.createSessionContainer(context.getSessionId(), uiApplication.getOwner()); } @@ -138,24 +137,31 @@ pcontainer.removeSessionContainer(sessionId); } - private PortalApplicationState getApplicationState(WebuiRequestContext context) { - PortalRequestContext portalContext = null; - if (context instanceof PortalRequestContext) - portalContext = (PortalRequestContext)context; - else - portalContext = (PortalRequestContext)context.getParentAppRequestContext(); - String portalName = portalContext.getPortalOwner(); - String sessionId = portalContext.getSessionId(); - - HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId); - return (appStates == null) ? null : appStates.get(portalName); + private PortalApplicationState getApplicationState(WebuiRequestContext context) + { + PortalRequestContext portalContext = null; + if (context instanceof PortalRequestContext) + { + portalContext = (PortalRequestContext)context; + } + else + { + portalContext = (PortalRequestContext)context.getParentAppRequestContext(); + } + String portalName = portalContext.getPortalOwner(); + String sessionId = portalContext.getSessionId(); + + HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId); + return (appStates == null) ? null : appStates.get(portalName); } - - private void cacheApplicationState(String sessionId, String portalName, PortalApplicationState state) { + + private void cacheApplicationState(String sessionId, String portalName, PortalApplicationState state) + { HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId); - if (appStates == null) { - appStates = new HashMap<String, PortalApplicationState>(); - uiApplications.put(sessionId, appStates); + if (appStates == null) + { + appStates = new HashMap<String, PortalApplicationState>(); + uiApplications.put(sessionId, appStates); } appStates.put(portalName, state); } Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/util ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -34,10 +34,9 @@ import org.gatein.pc.api.cache.CacheLevel; import org.gatein.pc.portlet.impl.spi.AbstractPortletInvocationContext; -import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -49,11 +48,15 @@ private HttpServletResponse response; private HttpServletRequest request; - + private String portalRequestURI; - + private String portletId; + static final String INTERACTION_STATE_PARAM_NAME = "interactionstate"; + static final String NAVIGATIONAL_STATE_PARAM_NAME = "navigationalstate"; + static final String RESOURCE_STATE_PARAM_NAME = "resourcestate"; + public ExoPortletInvocationContext(PortalRequestContext portalRequestContext, UIPortlet portlet) { super(new MarkupInfo(MediaType.create("text/html"), "UTF-8")); @@ -88,10 +91,10 @@ public String renderURL(ContainerURL containerURL, URLFormat format) { - StringBuilder baseURL = - new StringBuilder(this.portalRequestURI).append("?").append( - PortalRequestContext.UI_COMPONENT_ID).append("=").append(this.portletId); - + // todo: shouldn't we be using URLFormat to decide on the path to use at the beginning of the URL? + StringBuilder baseURL = new StringBuilder(this.portalRequestURI).append("?") + .append(PortalRequestContext.UI_COMPONENT_ID).append("=").append(this.portletId); + String type; if (containerURL instanceof RenderURL) { @@ -110,7 +113,8 @@ throw new Error("Unrecognized containerURL type"); } - baseURL.append("&portal:type=").append(type).append("&portal:isSecure=").append(request.isSecure()); + appendParameter(baseURL, "portal:type", type); + appendParameter(baseURL, "portal:isSecure", "" + format.getWantSecure()); if (containerURL instanceof ActionURL) { @@ -119,53 +123,77 @@ StateString state = actionURL.getInteractionState(); if (state != null) { - String value = state.getStringValue(); - if (value != null) - { - baseURL.append("&").append("interactionstate").append("=").append(value); - } + appendParameter(baseURL, INTERACTION_STATE_PARAM_NAME, state.getStringValue()); } + + state = actionURL.getNavigationalState(); + if (state != null) + { + appendParameter(baseURL, NAVIGATIONAL_STATE_PARAM_NAME, state.getStringValue()); + } + + WindowState windowState = actionURL.getWindowState(); + if (windowState != null) + { + appendParameter(baseURL, Constants.WINDOW_STATE_PARAMETER, windowState.toString()); + } + + Mode mode = actionURL.getMode(); + if (mode != null) + { + appendParameter(baseURL, Constants.PORTLET_MODE_PARAMETER, mode.toString()); + } } else if (containerURL instanceof ResourceURL) { ResourceURL resourceURL = (ResourceURL)containerURL; - String resourceId = resourceURL.getResourceId(); - if (resourceId != null) - { - baseURL.append("&").append(Constants.RESOURCE_ID_PARAMETER).append("=").append(resourceId); - } + appendParameter(baseURL, Constants.RESOURCE_ID_PARAMETER, resourceURL.getResourceId()); CacheLevel cachability = resourceURL.getCacheability(); - if (cachability != null && cachability.name() != null) + if (cachability != null) { - baseURL.append("&").append(Constants.CACHELEVEL_PARAMETER).append("=").append(cachability.name()); + appendParameter(baseURL, Constants.CACHELEVEL_PARAMETER, cachability.name()); } StateString resourceState = resourceURL.getResourceState(); if (resourceState != null) { - String value = resourceState.getStringValue(); - if (value != null) - { - baseURL.append("&").append("resourcestate").append("=").append(value); - } + appendParameter(baseURL, RESOURCE_STATE_PARAM_NAME, resourceState.getStringValue()); } + + resourceState = resourceURL.getNavigationalState(); + if (resourceState != null) + { + appendParameter(baseURL, NAVIGATIONAL_STATE_PARAM_NAME, resourceState.getStringValue()); + } + + WindowState windowState = resourceURL.getWindowState(); + if (windowState != null) + { + appendParameter(baseURL, Constants.WINDOW_STATE_PARAMETER, windowState.toString()); + } + + Mode mode = resourceURL.getMode(); + if (mode != null) + { + appendParameter(baseURL, Constants.PORTLET_MODE_PARAMETER, mode.toString()); + } } else { RenderURL renderURL = (RenderURL)containerURL; WindowState windowState = renderURL.getWindowState(); - if (windowState != null && windowState.toString() != null) + if (windowState != null) { - baseURL.append("&").append(Constants.WINDOW_STATE_PARAMETER).append("=").append(windowState.toString()); + appendParameter(baseURL, Constants.WINDOW_STATE_PARAMETER, windowState.toString()); } Mode mode = renderURL.getMode(); - if (mode != null && mode.toString() != null) + if (mode != null) { - baseURL.append("&").append(Constants.PORTLET_MODE_PARAMETER).append("=").append(mode); + appendParameter(baseURL, Constants.PORTLET_MODE_PARAMETER, mode.toString()); } Map<String, String[]> publicNSChanges = renderURL.getPublicNavigationalStateChanges(); @@ -176,12 +204,26 @@ String[] values = publicNSChanges.get(key); for (String value : values) { - baseURL.append("&").append(key).append("=").append(value); + appendParameter(baseURL, key, value); } } } + + StateString state = renderURL.getNavigationalState(); + if (state != null) + { + appendParameter(baseURL, NAVIGATIONAL_STATE_PARAM_NAME, state.getStringValue()); + } } return baseURL.toString(); } + + private void appendParameter(StringBuilder builder, String name, String value) + { + if (value != null) + { + builder.append("&").append(name).append("=").append(value); + } + } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -35,11 +35,11 @@ import org.exoplatform.portal.pom.spi.portlet.Preference; import org.exoplatform.portal.pom.spi.portlet.Preferences; import org.exoplatform.portal.pom.spi.portlet.PreferencesBuilder; -import org.exoplatform.portal.pom.spi.wsrp.WSRPState; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.portal.pom.spi.wsrp.WSRPPortletStateType; import org.exoplatform.web.application.gadget.GadgetApplication; import org.gatein.pc.api.PortletContext; import org.gatein.pc.api.PortletInvoker; -import org.gatein.pc.api.PortletStateType; import org.gatein.pc.api.StatefulPortletContext; import java.io.Serializable; @@ -58,20 +58,17 @@ { if (type == ApplicationType.PORTLET) { - @SuppressWarnings("unchecked") - ModelAdapter<S, C, I> adapter = (ModelAdapter<S, C, I>)PORTLET; + @SuppressWarnings("unchecked") ModelAdapter<S, C, I> adapter = (ModelAdapter<S, C, I>)PORTLET; return adapter; } else if (type == ApplicationType.GADGET) { - @SuppressWarnings("unchecked") - ModelAdapter<S, C, I> adapter = (ModelAdapter<S, C, I>)GADGET; + @SuppressWarnings("unchecked") ModelAdapter<S, C, I> adapter = (ModelAdapter<S, C, I>)GADGET; return adapter; } else if (type == ApplicationType.WSRP_PORTLET) { - @SuppressWarnings("unchecked") - ModelAdapter<S, C, I> adapter = (ModelAdapter<S, C, I>)WSRP; + @SuppressWarnings("unchecked") ModelAdapter<S, C, I> adapter = (ModelAdapter<S, C, I>)WSRP; return adapter; } else @@ -81,186 +78,174 @@ } /** . */ - private static final ModelAdapter<Preferences, ExoPortletState, PortletId> PORTLET = - new ModelAdapter<Preferences, ExoPortletState, PortletId>() - { + private static final ModelAdapter<Preferences, ExoPortletState, PortletId> PORTLET = new ModelAdapter<Preferences, ExoPortletState, PortletId>() + { - @Override - public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, - PortletId applicationId, ApplicationState<Preferences> applicationState) throws Exception + @Override + public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, PortletId applicationId, ApplicationState<Preferences> applicationState) throws Exception + { + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + Preferences preferences = dataStorage.load(applicationState); + PortletContext producerOfferedPortletContext = getProducerOfferedPortletContext(applicationId); + ExoPortletState map = new ExoPortletState(producerOfferedPortletContext.getId()); + if (preferences != null) { - DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - Preferences preferences = dataStorage.load(applicationState); - PortletContext producerOfferedPortletContext = getProducerOfferedPortletContext(applicationId); - ExoPortletState map = new ExoPortletState(producerOfferedPortletContext.getId()); - if (preferences != null) + for (Preference pref : preferences) { - for (Preference pref : preferences) - { - map.getState().put(pref.getName(), pref.getValues()); - } + map.getState().put(pref.getName(), pref.getValues()); } - return StatefulPortletContext.create("local._dumbvalue", ExoPortletStateType.getInstance(), map); } + return StatefulPortletContext.create("local._dumbvalue", ExoPortletStateType.getInstance(), map); + } - @Override - public ApplicationState<Preferences> update(ExoContainer container, ExoPortletState updateState, - ApplicationState<Preferences> applicationState) throws Exception + @Override + public ApplicationState<Preferences> update(ExoContainer container, ExoPortletState updateState, ApplicationState<Preferences> applicationState) throws Exception + { + // Compute new preferences + PreferencesBuilder builder = new PreferencesBuilder(); + for (Map.Entry<String, List<String>> entry : updateState.getState().entrySet()) { - if (applicationState instanceof TransientApplicationState) - { - TransientApplicationState<Preferences> transientState = - (TransientApplicationState<Preferences>)applicationState; - PreferencesBuilder builder = new PreferencesBuilder(); - for (Map.Entry<String, List<String>> entry : updateState.getState().entrySet()) - { - builder.add(entry.getKey(), entry.getValue()); - } - transientState.setContentState(builder.build()); - return transientState; - } - else - { - PersistentApplicationState<Preferences> persistentState = - (PersistentApplicationState<Preferences>)applicationState; - - // Compute new preferences - PreferencesBuilder builder = new PreferencesBuilder(); - for (Map.Entry<String, List<String>> entry : updateState.getState().entrySet()) - { - builder.add(entry.getKey(), entry.getValue()); - } - - // - DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - return dataStorage.save(persistentState, builder.build()); - } + builder.add(entry.getKey(), entry.getValue()); } - @Override - public PortletContext getProducerOfferedPortletContext(PortletId applicationState) + if (applicationState instanceof TransientApplicationState) { - String appName = applicationState.getApplicationName(); - String portletName = applicationState.getPortletName(); - return PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + "./" + appName + "." - + portletName); + TransientApplicationState<Preferences> transientState = (TransientApplicationState<Preferences>)applicationState; + transientState.setContentState(builder.build()); + return transientState; } - - @Override - public Preferences getState(ExoContainer container, ApplicationState<Preferences> applicationState) - throws Exception + else { - if (applicationState instanceof TransientApplicationState) - { - TransientApplicationState<Preferences> transientState = - (TransientApplicationState<Preferences>)applicationState; - Preferences pref = transientState.getContentState(); - if(pref == null) pref = new Preferences(); - return pref; - } - else - { - PersistentApplicationState<Preferences> persistentState = - (PersistentApplicationState<Preferences>)applicationState; - DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - return dataStorage.load(persistentState); - } + PersistentApplicationState<Preferences> persistentState = (PersistentApplicationState<Preferences>)applicationState; + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + return dataStorage.save(persistentState, builder.build()); } - }; + } - private static final ModelAdapter<Gadget, ExoPortletState, GadgetId> GADGET = - new ModelAdapter<Gadget, ExoPortletState, GadgetId>() + @Override + public PortletContext getProducerOfferedPortletContext(PortletId applicationState) { + String appName = applicationState.getApplicationName(); + String portletName = applicationState.getPortletName(); + return PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + "./" + appName + "." + portletName); + } - /** . */ - private final String WRAPPER_ID = "local./" + "dashboard" + "." + "GadgetPortlet"; - - /** . */ - private final PortletContext WRAPPER_CONTEXT = PortletContext.createPortletContext(WRAPPER_ID); - - @Override - public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, - GadgetId applicationId, ApplicationState<Gadget> applicationState) throws Exception + @Override + public Preferences getState(ExoContainer container, ApplicationState<Preferences> applicationState) throws Exception + { + if (applicationState instanceof TransientApplicationState) { - GadgetRegistryService gadgetService = - (GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class); - org.exoplatform.application.gadget.Gadget model = gadgetService.getGadget(applicationId.getGadgetName()); - GadgetApplication application = new GadgetApplication(model.getName(), model.getUrl(), model.isLocal()); - String url = GadgetUtil.reproduceUrl(application.getUrl(), application.isLocal()); - ExoPortletState prefs = new ExoPortletState(WRAPPER_ID); - prefs.getState().put("url", Arrays.asList(url)); - return StatefulPortletContext.create("local._dumbvalue", ExoPortletStateType.getInstance(), prefs); + TransientApplicationState<Preferences> transientState = (TransientApplicationState<Preferences>)applicationState; + Preferences pref = transientState.getContentState(); + if(pref == null) pref = new Preferences(); + return pref; } - - @Override - public ApplicationState<Gadget> update(ExoContainer container, ExoPortletState updateState, - ApplicationState<Gadget> gadgetApplicationState) throws Exception + else { - throw new UnsupportedOperationException("todo / julien"); + PersistentApplicationState<Preferences> persistentState = (PersistentApplicationState<Preferences>)applicationState; + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + return dataStorage.load(persistentState); } + } + }; - @Override - public PortletContext getProducerOfferedPortletContext(GadgetId applicationState) - { - return WRAPPER_CONTEXT; - } + private static final ModelAdapter<Gadget, ExoPortletState, GadgetId> GADGET = new ModelAdapter<Gadget, ExoPortletState, GadgetId>() + { - @Override - public Preferences getState(ExoContainer container, ApplicationState<Gadget> applicationState) - throws Exception - { - // For now we return null as it does not make sense to edit the gadget preferences - return null; - } - }; + /** . */ + private final String WRAPPER_ID = "local./" + "dashboard" + "." + "GadgetPortlet"; - private static final ModelAdapter<WSRPState, byte[], WSRPId> WSRP = new ModelAdapter<WSRPState, byte[], WSRPId>() - { + /** . */ + private final PortletContext WRAPPER_CONTEXT = PortletContext.createPortletContext(WRAPPER_ID); + @Override - public PortletContext getProducerOfferedPortletContext(WSRPId state) + public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, GadgetId applicationId, ApplicationState<Gadget> applicationState) throws Exception { - return PortletContext.createPortletContext(state.getUri()); + GadgetRegistryService gadgetService = (GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class); + org.exoplatform.application.gadget.Gadget model = gadgetService.getGadget(applicationId.getGadgetName()); + GadgetApplication application = new GadgetApplication(model.getName(), model.getUrl(), model.isLocal()); + String url = GadgetUtil.reproduceUrl(application.getUrl(), application.isLocal()); + ExoPortletState prefs = new ExoPortletState(WRAPPER_ID); + prefs.getState().put("url", Arrays.asList(url)); + return StatefulPortletContext.create("local._dumbvalue", ExoPortletStateType.getInstance(), prefs); } @Override - public StatefulPortletContext<byte[]> getPortletContext(ExoContainer container, WSRPId applicationId, - ApplicationState<WSRPState> state) throws Exception + public ApplicationState<Gadget> update(ExoContainer container, ExoPortletState updateState, ApplicationState<Gadget> gadgetApplicationState) throws Exception { - DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - WSRPState wsrpState = dataStorage.load(state); - // todo: it should be possible to not have a state: needs a fix in StatefulPortletContext - return StatefulPortletContext.create(applicationId.getUri(), PortletStateType.OPAQUE, wsrpState != null - ? wsrpState.getState() : new byte[]{}); + throw new UnsupportedOperationException("todo / julien"); } @Override - public ApplicationState<WSRPState> update(ExoContainer container, byte[] updateState, - ApplicationState<WSRPState> wsrpApplicationState) throws Exception + public PortletContext getProducerOfferedPortletContext(GadgetId applicationState) { - throw new UnsupportedOperationException("todo / chris"); + return WRAPPER_CONTEXT; } @Override - public Preferences getState(ExoContainer container, ApplicationState<WSRPState> wsrpStateApplicationState) - throws Exception + public Preferences getState(ExoContainer container, ApplicationState<Gadget> applicationState) throws Exception { - // For now we return null + // For now we return null as it does not make sense to edit the gadget preferences return null; } }; + + private static final ModelAdapter<WSRP, WSRP, WSRPId> WSRP = new ModelAdapter<WSRP, WSRP, WSRPId>() + { + @Override + public Preferences getState(ExoContainer container, ApplicationState<WSRP> state) throws Exception + { + return null; // return null for now + } + + @Override + public PortletContext getProducerOfferedPortletContext(WSRPId applicationId) + { + return PortletContext.createPortletContext(applicationId.getUri()); + } + + @Override + public StatefulPortletContext<WSRP> getPortletContext(ExoContainer container, WSRPId applicationId, ApplicationState<WSRP> state) throws Exception + { + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + WSRP wsrp = dataStorage.load(state); + if (wsrp == null) + { + wsrp = new WSRP(); + wsrp.setPortletId(applicationId.getUri()); + } + return StatefulPortletContext.create(wsrp.getPortletId(), WSRPPortletStateType.instance, wsrp); + } + + @Override + public ApplicationState<WSRP> update(ExoContainer container, WSRP updateState, ApplicationState<WSRP> state) throws Exception + { + if (state instanceof TransientApplicationState) + { + TransientApplicationState<WSRP> transientState = (TransientApplicationState<WSRP>)state; + transientState.setContentState(updateState); + return transientState; + } + else + { + PersistentApplicationState<WSRP> persistentState = (PersistentApplicationState<WSRP>)state; + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + return dataStorage.save(persistentState, updateState); + } + } + }; + public abstract PortletContext getProducerOfferedPortletContext(I applicationId); - public abstract StatefulPortletContext<C> getPortletContext(ExoContainer container, I applicationId, - ApplicationState<S> applicationState) throws Exception; + public abstract StatefulPortletContext<C> getPortletContext(ExoContainer container, I applicationId, ApplicationState<S> applicationState) throws Exception; - public abstract ApplicationState<S> update(ExoContainer container, C updateState, - ApplicationState<S> applicationState) throws Exception; + public abstract ApplicationState<S> update(ExoContainer container, C updateState, ApplicationState<S> applicationState) throws Exception; /** * Returns the state of the gadget as preferences or null if the preferences cannot be edited as such. * - * @param container the container + * @param container the container * @param applicationState the application state * @return the preferences * @throws Exception any exception Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -34,7 +34,7 @@ import org.exoplatform.portal.config.model.portlet.PortletId; import org.exoplatform.portal.config.model.wsrp.WSRPId; import org.exoplatform.portal.pom.spi.portlet.Preferences; -import org.exoplatform.portal.pom.spi.wsrp.WSRPState; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.webui.page.UIPage; import org.exoplatform.portal.webui.portal.UIPortal; import org.exoplatform.portal.webui.util.PortalDataMapper; @@ -73,19 +73,19 @@ return listAppCategories; } - public List<ApplicationCategory> getApplicationCategories(String remoteUser, String[] applicationType) - throws Exception + public List<ApplicationCategory> getApplicationCategories(String remoteUser, + String[] applicationType) throws Exception { ExoContainer container = ExoContainerContext.getCurrentContainer(); - ApplicationRegistryService prService = - (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class); + ApplicationRegistryService prService = (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class); if (applicationType == null) { applicationType = new String[]{}; } - List<ApplicationCategory> appCategories = prService.getApplicationCategories(remoteUser, applicationType); + List<ApplicationCategory> appCategories = prService.getApplicationCategories(remoteUser, + applicationType); if (appCategories == null) { @@ -99,7 +99,9 @@ ApplicationCategory cate = cateItr.next(); List<Application> applications = cate.getApplications(); if (applications.size() < 1) + { cateItr.remove(); + } } } listAppCategories = appCategories; @@ -139,7 +141,9 @@ for (Application application : applications) { if (application.getId().equals(id)) + { return application; + } } } @@ -207,7 +211,7 @@ } else { - appState = new TransientApplicationState<WSRPState>(); + appState = new TransientApplicationState<WSRP>(); appId = new WSRPId(application.getUri()); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -26,6 +26,7 @@ import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.portlet.PortletId; import org.exoplatform.portal.pom.spi.portlet.Preferences; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.webui.application.UIPortletActionListener.ChangePortletModeActionListener; import org.exoplatform.portal.webui.application.UIPortletActionListener.ChangeWindowStateActionListener; import org.exoplatform.portal.webui.application.UIPortletActionListener.EditPortletActionListener; @@ -66,6 +67,7 @@ import org.gatein.pc.api.invocation.RenderInvocation; import org.gatein.pc.api.invocation.ResourceInvocation; import org.gatein.pc.api.invocation.response.PortletInvocationResponse; +import org.gatein.pc.api.state.AccessMode; import org.gatein.pc.api.state.PropertyChange; import org.gatein.pc.portlet.impl.spi.AbstractClientContext; import org.gatein.pc.portlet.impl.spi.AbstractPortalContext; @@ -73,6 +75,11 @@ import org.gatein.pc.portlet.impl.spi.AbstractSecurityContext; import org.gatein.pc.portlet.impl.spi.AbstractServerContext; +import javax.portlet.PortletMode; +import javax.portlet.WindowState; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.xml.namespace.QName; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -83,28 +90,25 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import java.util.Map.Entry; -import javax.portlet.PortletMode; -import javax.portlet.WindowState; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.xml.namespace.QName; - -/** - * May 19, 2006 - */ -@ComponentConfig(lifecycle = UIPortletLifecycle.class, template = "system:/groovy/portal/webui/application/UIPortlet.gtmpl", events = { - @EventConfig(listeners = RenderActionListener.class), - @EventConfig(listeners = ChangePortletModeActionListener.class), - @EventConfig(listeners = ChangeWindowStateActionListener.class), - @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIPortlet.deletePortlet"), - @EventConfig(listeners = EditPortletActionListener.class), - @EventConfig(phase = Phase.PROCESS, listeners = ProcessActionActionListener.class), - @EventConfig(phase = Phase.PROCESS, listeners = ServeResourceActionListener.class), - @EventConfig(phase = Phase.PROCESS, listeners = ProcessEventsActionListener.class)}) +/** May 19, 2006 */ +@ComponentConfig( + lifecycle = UIPortletLifecycle.class, + template = "system:/groovy/portal/webui/application/UIPortlet.gtmpl", + events = { + @EventConfig(listeners = RenderActionListener.class), + @EventConfig(listeners = ChangePortletModeActionListener.class), + @EventConfig(listeners = ChangeWindowStateActionListener.class), + @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIPortlet.deletePortlet"), + @EventConfig(listeners = EditPortletActionListener.class), + @EventConfig(phase = Phase.PROCESS, listeners = ProcessActionActionListener.class), + @EventConfig(phase = Phase.PROCESS, listeners = ServeResourceActionListener.class), + @EventConfig(phase = Phase.PROCESS, listeners = ProcessEventsActionListener.class) + } +) public class UIPortlet<S, C extends Serializable, I> extends UIApplication { @@ -134,24 +138,19 @@ private PortletState<S, I> state; private String theme_; - private String portletStyle; - private boolean showPortletMode = true; - private Map<String, String[]> renderParametersMap_; - private PortletMode currentPortletMode_ = PortletMode.VIEW; - private WindowState currentWindowState_ = WindowState.NORMAL; private List<String> supportModes_; private List<QName> supportedProcessingEvents_; - private List<String> supportedPublicParams_; - private boolean portletInPortal_ = true; + private StateString navigationalState; + private Map<String, String[]> publicNavigationalStateChanges; public UIPortlet() { @@ -195,8 +194,7 @@ ApplicationType<S, I> type = state.getApplicationType(); if (type == ApplicationType.PORTLET) { - return ((PortletId)state.getApplicationId()).getApplicationName() + "/" - + ((PortletId)state.getApplicationId()).getPortletName(); + return ((PortletId)state.getApplicationId()).getApplicationName() + "/" + ((PortletId)state.getApplicationId()).getPortletName(); } else if (type == ApplicationType.GADGET) { @@ -246,7 +244,9 @@ public String getTheme() { if (theme_ == null || theme_.trim().length() < 1) + { return DEFAULT_THEME; + } return theme_; } @@ -289,7 +289,9 @@ Entry<String, String> entry = itr.next(); builder.append(entry.getKey()).append(":").append(entry.getValue()); if (itr.hasNext()) + { builder.append("::"); + } } return builder.toString(); } @@ -306,16 +308,6 @@ return themeMap; } - public Map<String, String[]> getRenderParametersMap() - { - return renderParametersMap_; - } - - public void setRenderParametersMap(Map<String, String[]> map) - { - renderParametersMap_ = map; - } - public PortletMode getCurrentPortletMode() { return currentPortletMode_; @@ -421,7 +413,9 @@ public List<String> getSupportModes() { if (supportModes_ != null) + { return supportModes_; + } List<String> supportModes = new ArrayList<String>(); @@ -442,11 +436,11 @@ } if (supportModes.size() > 0) + { supportModes.remove("view"); + } setSupportModes(supportModes); - System.out.println("--- SUPPORT MODES : " + supportModes); - return supportModes; } @@ -456,8 +450,8 @@ } /** - * Tells, according to the info located in portlet.xml, wether this portlet can handle - * a portlet event with the QName given as the method argument + * Tells, according to the info located in portlet.xml, wether this portlet can handle a portlet event with the QName + * given as the method argument */ public boolean supportsProcessingEvent(QName name) { @@ -473,11 +467,12 @@ return false; } - Map<QName, EventInfo> consumedEvents = - (Map<QName, EventInfo>)portlet.getInfo().getEventing().getConsumedEvents(); + Map<QName, EventInfo> consumedEvents = (Map<QName, EventInfo>)portlet.getInfo().getEventing().getConsumedEvents(); if (consumedEvents == null) + { return false; + } supportedProcessingEvents_ = new ArrayList<QName>(consumedEvents.keySet()); } @@ -496,8 +491,8 @@ } /** - * Tells, according to the info located in portlet.xml, wether this portlet supports the public - * render parameter given as a method argument + * Tells, according to the info located in portlet.xml, wether this portlet supports the public render parameter + * given as a method argument */ public boolean supportsPublicParam(String supportedPublicParam) { @@ -512,8 +507,7 @@ } // - Collection<ParameterInfo> parameters = - (Collection<ParameterInfo>)producedOfferedPortlet.getInfo().getNavigation().getPublicParameters(); + Collection<ParameterInfo> parameters = (Collection<ParameterInfo>)producedOfferedPortlet.getInfo().getNavigation().getPublicParameters(); supportedPublicParams_ = new ArrayList<String>(); for (ParameterInfo parameter : parameters) { @@ -527,8 +521,9 @@ if (publicParam.equals(supportedPublicParam)) { if (log.isDebugEnabled()) - log.debug("The Portlet " + producerOfferedPortletContext.getId() - + " supports the public render parameter : " + supportedPublicParam); + { + log.debug("The Portlet " + producerOfferedPortletContext.getId() + " supports the public render parameter : " + supportedPublicParam); + } return true; } } @@ -538,10 +533,8 @@ } /** - * This methods return the public render parameters names supported - * by the targeted portlet; in other words, it sorts the full public - * render params list and only return the ones that the current portlet - * can handle + * This methods return the public render parameters names supported by the targeted portlet; in other words, it sorts + * the full public render params list and only return the ones that the current portlet can handle */ public List<String> getPublicRenderParamNames() { @@ -552,9 +545,8 @@ if (publicParams != null) { Set<String> keys = publicParams.keySet(); - for (Iterator<String> iter = keys.iterator(); iter.hasNext();) + for (String key : keys) { - String key = iter.next(); if (supportsPublicParam(key)) { publicParamsSupportedByPortlet.add(key); @@ -572,11 +564,12 @@ Map<String, String[]> publicParams = uiPortal.getPublicParameters(); Set<String> allPublicParamsNames = publicParams.keySet(); List<String> supportedPublicParamNames = getPublicRenderParamNames(); - for (Iterator<String> iter = allPublicParamsNames.iterator(); iter.hasNext();) + for (String oneOfAllParams : allPublicParamsNames) { - String oneOfAllParams = iter.next(); if (supportedPublicParamNames.contains(oneOfAllParams)) + { publicParamsMap.put(oneOfAllParams, publicParams.get(oneOfAllParams)); + } } return publicParamsMap; } @@ -587,8 +580,8 @@ * Create the correct portlet invocation that will target the portlet represented by this UI component. * * @param type the invocation type - * @param prc the portal request context - * @param <I> the invocation type + * @param prc the portal request context + * @param <I> the invocation type * @return the portlet invocation * @throws Exception any exception */ @@ -608,7 +601,7 @@ actionInvocation.setForm(allParams); actionInvocation.setRequestContext(new AbstractRequestContext(servletRequest)); - String interactionState = servletRequest.getParameter("interactionstate"); + String interactionState = servletRequest.getParameter(ExoPortletInvocationContext.INTERACTION_STATE_PARAM_NAME); if (interactionState != null) { actionInvocation.setInteractionState(StateString.create(interactionState)); @@ -633,7 +626,7 @@ resourceInvocation.setCacheLevel(CacheLevel.valueOf(cachability)); } - String resourceState = servletRequest.getParameter("resourcestate"); + String resourceState = servletRequest.getParameter(ExoPortletInvocationContext.RESOURCE_STATE_PARAM_NAME); if (resourceState != null) { resourceInvocation.setResourceState(StateString.create(resourceState)); @@ -657,10 +650,11 @@ } // Navigational state - String stateString = StateString.encodeAsOpaqueValue(getRenderParameterMap(this)); - StateString navigationalState = StateString.create(stateString); invocation.setNavigationalState(navigationalState); + // Public navigational state + invocation.setPublicNavigationalState(publicNavigationalStateChanges); + // Mode invocation.setMode(Mode.create(getCurrentPortletMode().toString())); @@ -688,13 +682,30 @@ } invocation.setClientContext(clientContext); + // instance context + ExoPortletInstanceContext instanceContext; + if (ApplicationType.WSRP_PORTLET.equals(state.getApplicationType())) + { + WSRP wsrp = (WSRP)preferencesPortletContext.getState(); + AccessMode accessMode = AccessMode.CLONE_BEFORE_WRITE; + if (wsrp.isCloned()) + { + accessMode = AccessMode.READ_WRITE; + } + instanceContext = new ExoPortletInstanceContext(preferencesPortletContext.getId(), accessMode); + } + else + { + instanceContext = new ExoPortletInstanceContext(preferencesPortletContext.getId()); + } + invocation.setInstanceContext(instanceContext); + + invocation.setServerContext(new AbstractServerContext(servletRequest, prc.getResponse())); - invocation.setInstanceContext(new ExoPortletInstanceContext(preferencesPortletContext.getId())); //TODO: ExoUserContext impl not tested invocation.setUserContext(new ExoUserContext(servletRequest, userProfile)); invocation.setWindowContext(new ExoWindowContext(storageName)); - invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap( - "javax.portlet.markup.head.element.support", "true"))); + invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap("javax.portlet.markup.head.element.support", "true"))); invocation.setSecurityContext(new AbstractSecurityContext(servletRequest)); // @@ -704,32 +715,6 @@ return invocation; } - /** - * This method returns all the parameters supported by the targeted portlets, - * both the private and public ones - */ - private Map<String, String[]> getRenderParameterMap(UIPortlet uiPortlet) - { - Map<String, String[]> renderParams = uiPortlet.getRenderParametersMap(); - - if (renderParams == null) - { - renderParams = new HashMap<String, String[]>(); - uiPortlet.setRenderParametersMap(renderParams); - } - - /* - * handle public params to only get the one supported by the targeted - * portlet - */ - Map<String, String[]> allParams = new HashMap<String, String[]>(renderParams); - allParams.putAll(uiPortlet.getPublicParameters()); - - return allParams; - } - - // - public void update(PropertyChange... changes) throws Exception { PortletContext portletContext = getPortletContext(); @@ -738,8 +723,7 @@ PortletInvoker portletInvoker = getApplicationComponent(PortletInvoker.class); // Get marshalled version - StatefulPortletContext<C> updatedCtx = - (StatefulPortletContext<C>)portletInvoker.setProperties(portletContext, changes); + StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)portletInvoker.setProperties(portletContext, changes); // C updateState = updatedCtx.getState(); @@ -761,8 +745,7 @@ { PortletInvoker portletInvoker = getApplicationComponent(PortletInvoker.class); ModelAdapter<S, C, I> adapter = ModelAdapter.getAdapter(state.getApplicationType()); - PortletContext producerOfferedPortletContext = - adapter.getProducerOfferedPortletContext(state.getApplicationId()); + PortletContext producerOfferedPortletContext = adapter.getProducerOfferedPortletContext(state.getApplicationId()); Portlet producedOfferedPortlet = portletInvoker.getPortlet(producerOfferedPortletContext); this.adapter = adapter; @@ -823,10 +806,7 @@ setState(state); } - /** - * This is used by the dashboard portlet and should not be used else where. - * It will be removed some day. - */ + /** This is used by the dashboard portlet and should not be used else where. It will be removed some day. */ private static final ThreadLocal<UIPortlet> currentPortlet = new ThreadLocal<UIPortlet>(); public static UIPortlet getCurrentUIPortlet() @@ -854,4 +834,14 @@ currentPortlet.set(null); } } -} + + void setNavigationalState(StateString navigationalState) + { + this.navigationalState = navigationalState; + } + + void setPublicNavigationalStateUpdates(Map<String, String[]> publicNavigationalStateUpdates) + { + this.publicNavigationalStateChanges = publicNavigationalStateUpdates; + } +} \ No newline at end of file Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -19,8 +19,8 @@ package org.exoplatform.portal.webui.application; -import org.exoplatform.Constants; import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.webui.page.UIPage; import org.exoplatform.portal.webui.page.UIPageBody; import org.exoplatform.portal.webui.portal.UIPortal; @@ -33,9 +33,12 @@ import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; +import org.exoplatform.webui.event.EventListener; import org.gatein.common.util.MultiValuedPropertyMap; +import org.gatein.pc.api.Mode; +import org.gatein.pc.api.ParametersStateString; +import org.gatein.pc.api.PortletContext; import org.gatein.pc.api.StateString; import org.gatein.pc.api.StatefulPortletContext; import org.gatein.pc.api.invocation.ActionInvocation; @@ -46,6 +49,11 @@ import org.gatein.pc.api.invocation.response.PortletInvocationResponse; import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse; +import javax.portlet.PortletMode; +import javax.portlet.WindowState; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; @@ -53,18 +61,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; -import javax.portlet.PortletMode; -import javax.portlet.ResourceURL; -import javax.portlet.WindowState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; - -/** - * May 29, 2006 - */ +/** May 29, 2006 */ public class UIPortletActionListener { @@ -73,15 +71,13 @@ protected static Log log = ExoLogger.getLogger("portal:UIPortletActionListener"); /** - * The process action listener is called when an ActionURL generated by the - * portlet container has been invoked by the client - * - * The call is delegated to the portlet container iteself using the method - * portletContainer.processAction(...). It returns an object of type - * ActionOutput that contains several information such as the next window - * state and portlet modes (if they have to change) as well as a list of - * Events to be broadcasted to the other portlets located in the same portal - * page + * The process action listener is called when an ActionURL generated by the portlet container has been invoked by the + * client + * <p/> + * The call is delegated to the portlet container iteself using the method portletContainer.processAction(...). It + * returns an object of type ActionOutput that contains several information such as the next window state and portlet + * modes (if they have to change) as well as a list of Events to be broadcasted to the other portlets located in the + * same portal page */ static public class ProcessActionActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C, I>> @@ -97,7 +93,7 @@ // PortletInvocationResponse portletResponse = uiPortlet.invoke(actionInvocation); - // + // deal with potential portlet context modifications ExoPortletInstanceContext instanceCtx = (ExoPortletInstanceContext)actionInvocation.getInstanceContext(); if (instanceCtx.getModifiedContext() != null) { @@ -105,7 +101,25 @@ C portletState = updatedCtx.getState(); uiPortlet.update(portletState); } + else + { + // todo: fix me as this shouldn't probably be done only for the WSRP case� + PortletContext clonedContext = instanceCtx.getClonedContext(); + if (clonedContext != null) + { + WSRP wsrp = new WSRP(); + wsrp.setPortletId(clonedContext.getId()); + // if we have an associated state, record it as well... + if (clonedContext instanceof StatefulPortletContext) + { + StatefulPortletContext statefulPortletContext = (StatefulPortletContext)clonedContext; + wsrp.setState((byte[])statefulPortletContext.getState()); + } + uiPortlet.update((C)wsrp); + } + } + // todo: handle the error response better than this. if (!(portletResponse instanceof UpdateNavigationalStateResponse)) { @@ -131,11 +145,11 @@ * If the current node is displaying a usual layout page, also tells the * page which portlet to render or not when the state is maximized */ - WindowState state = new WindowState(navStateResponse.getWindowState().toString()); + WindowState state = new WindowState(getWindowStateOrDefault(navStateResponse)); setNextState(uiPortlet, state); // update the portlet with the next mode to display - PortletMode mode = new PortletMode(navStateResponse.getMode().toString()); + PortletMode mode = new PortletMode(getPortletModeOrDefault(navStateResponse)); setNextMode(uiPortlet, mode); // set the public params @@ -150,8 +164,9 @@ */ // - uiPortlet.setRenderParametersMap(navStateResponse.getPublicNavigationalStateUpdates()); - // + StateString navigationalState = navStateResponse.getNavigationalState(); + uiPortlet.setNavigationalState(navigationalState); + uiPortlet.setPublicNavigationalStateUpdates(navStateResponse.getPublicNavigationalStateUpdates()); /* * Handle the events returned by the action output and broadcast a new UI @@ -209,8 +224,8 @@ } /** - * This method is used to set the next portlet window state if this one needs to - * be modified because of the incoming request + * This method is used to set the next portlet window state if this one needs to be modified because of the incoming + * request */ public static void setNextState(UIPortlet uiPortlet, WindowState state) { @@ -221,27 +236,30 @@ { uiPortlet.setCurrentWindowState(WindowState.MAXIMIZED); if (uiPage != null) + { uiPage.setMaximizedUIPortlet(uiPortlet); + } } else if (state == WindowState.MINIMIZED) { uiPortlet.setCurrentWindowState(WindowState.MINIMIZED); if (uiPage != null) + { uiPage.setMaximizedUIPortlet(null); + } } else { uiPortlet.setCurrentWindowState(WindowState.NORMAL); if (uiPage != null) + { uiPage.setMaximizedUIPortlet(null); + } } } } - /** - * This method is used to set the next portlet mode if this one needs to - * be modified because of the incoming request - */ + /** This method is used to set the next portlet mode if this one needs to be modified because of the incoming request */ public static void setNextMode(UIPortlet uiPortlet, PortletMode portletMode) { if (portletMode != null) @@ -262,21 +280,18 @@ } /** - * The serveResource() method defined in the JSR 286 specs has several goals: - * - provide binary output like images to be displayed in the portlet (in the previous - * spec - JSR 168 - a servlet was needed) - * - provide text output that does not impact the entire portal rendering, it is for - * instance usefull when dealing with Javascript to return some JSON structures - * - * The method delegates the call to the portlet container serverResource method after - * filling the ResourceInput object with the current request state. - * - * This returns a ResourceOutput object that can content binary or text contentType - * - * Finally the content is set in the portal response writer or outputstream depending - * on the type; the processRender() method of the portal is not called as we set the - * response as complete - * + * The serveResource() method defined in the JSR 286 specs has several goals: - provide binary output like images to + * be displayed in the portlet (in the previous spec - JSR 168 - a servlet was needed) - provide text output that + * does not impact the entire portal rendering, it is for instance usefull when dealing with Javascript to return + * some JSON structures + * <p/> + * The method delegates the call to the portlet container serverResource method after filling the ResourceInput + * object with the current request state. + * <p/> + * This returns a ResourceOutput object that can content binary or text contentType + * <p/> + * Finally the content is set in the portal response writer or outputstream depending on the type; the + * processRender() method of the portal is not called as we set the response as complete */ static public class ServeResourceActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C, I>> @@ -288,9 +303,7 @@ try { PortalRequestContext context = (PortalRequestContext)event.getRequestContext(); - HttpServletRequest request = context.getRequest(); HttpServletResponse response = context.getResponse(); - String resourceId = request.getParameter(Constants.RESOURCE_ID_PARAMETER); // ResourceInvocation resourceInvocation = uiPortlet.create(ResourceInvocation.class, context); @@ -335,7 +348,9 @@ String contentType = piResponse.getContentType(); if (contentType == null) + { return; + } log.info("Try to get a resource of type: " + contentType + " for the portlet: " + uiPortlet.getPortletContext()); @@ -368,59 +383,9 @@ } /** - * This method returns all the parameters supported by the targeted portlets, - * both the private and public ones + * Process Events sent by the portlet API during the processAction() and serverResource() methods defined in Portlet + * API 2.0 (JSR 286) */ - @SuppressWarnings({"unchecked"}) - private static Map getResourceParameterMap(UIPortlet uiPortlet, PortalRequestContext prcontext) - { - - Map portletParams = new HashMap(prcontext.getPortletParameters()); - - /* - * For serveResource requests the portlet must receive any resource parameters that - * were explicitly set on the ResourceURL that triggered the request. If - * the cacheability level of that resource URL (see PLT.13.7) was PORTLET or PAGE, - * the portlet must also receive the render parameters present in the request in - * which the URL was created. - * - * If a resource parameter is set that has the same name as a render parameter, - * the render parameter must be the last entry in the parameter value array. - */ - String cacheLevel = prcontext.getCacheLevel(); - if (ResourceURL.PAGE.equals(cacheLevel) || ResourceURL.PORTLET.equals(cacheLevel)) - { - Map renderParams = uiPortlet.getRenderParametersMap(); - if (renderParams != null) - { - Set keys = renderParams.keySet(); - for (Iterator iter = keys.iterator(); iter.hasNext();) - { - String key = (String)iter.next(); - if (portletParams.containsKey(key)) - { - String[] renderValueArray = (String[])renderParams.get(key); - String[] portletValueArray = (String[])portletParams.get(key); - String[] resources = new String[renderValueArray.length + portletValueArray.length]; - System.arraycopy(portletValueArray, 0, resources, 0, portletValueArray.length); - System.arraycopy(renderValueArray, 0, resources, portletValueArray.length, renderValueArray.length); - portletParams.put(key, resources); - } - else - { - portletParams.put(key, renderParams.get(key)); - } - } - portletParams.putAll(renderParams); - } - } - return portletParams; - } - - /** - * Process Events sent by the portlet API during the processAction() and - * serverResource() methods defined in Portlet API 2.0 (JSR 286) - */ static public class ProcessEventsActionListener extends EventListener<UIPortlet> { public void execute(Event<UIPortlet> event) throws Exception @@ -478,14 +443,14 @@ } /** - * This method is called when the javax.portlet.Event is supported by the - * current portlet stored in the Portlet Caontainer - * - * The processEvent() method can also generates IPC events and hence the - * portal itself will call the ProcessEventsActionListener once again + * This method is called when the javax.portlet.Event is supported by the current portlet stored in the Portlet + * Caontainer + * <p/> + * The processEvent() method can also generates IPC events and hence the portal itself will call the + * ProcessEventsActionListener once again */ public static <S, C extends Serializable, I> List<javax.portlet.Event> processEvent(UIPortlet<S, C, I> uiPortlet, - javax.portlet.Event event) + javax.portlet.Event event) { log.info("Process Event: " + event.getName() + " for portlet: " + uiPortlet.getState()); try @@ -537,11 +502,11 @@ * If the current node is displaying a usual layout page, also tells the * page which portlet to render or not when the state is maximized */ - WindowState state = new WindowState(navResponse.getWindowState().toString()); + WindowState state = new WindowState(getWindowStateOrDefault(navResponse)); setNextState(uiPortlet, state); // update the portlet with the next mode to display - PortletMode mode = new PortletMode(navResponse.getMode().toString()); + PortletMode mode = new PortletMode(getPortletModeOrDefault(navResponse)); setNextMode(uiPortlet, mode); //TODO: (mwringe) add this to the UpdateNavigationStateResponse.Event class instead of here @@ -593,19 +558,37 @@ return null; } + private static String getPortletModeOrDefault(UpdateNavigationalStateResponse navResponse) + { + Mode mode = navResponse.getMode(); + if (mode == null) + { + mode = Mode.VIEW; + } + return mode.toString(); + } + + private static String getWindowStateOrDefault(UpdateNavigationalStateResponse navResponse) + { + org.gatein.pc.api.WindowState state = navResponse.getWindowState(); + if (state == null) + { + state = org.gatein.pc.api.WindowState.NORMAL; + } + return state.toString(); + } + /** - * This listener is called when a RenderURL url has been generated by the - * portlet container. In that case it means that the render() method of a - * targeted portlet will be directly called and that the existing navigational - * state will be reset by removing all the Render Parameters from the cache - * map located in the UIPortlet + * This listener is called when a RenderURL url has been generated by the portlet container. In that case it means + * that the render() method of a targeted portlet will be directly called and that the existing navigational state + * will be reset by removing all the Render Parameters from the cache map located in the UIPortlet */ static public class RenderActionListener extends EventListener<UIPortlet> { public void execute(Event<UIPortlet> event) throws Exception { UIPortlet uiPortlet = event.getSource(); - uiPortlet.setRenderParametersMap(null); + uiPortlet.setNavigationalState(null); // set the public params HttpServletRequest request = event.getRequestContext().getRequest(); @@ -613,28 +596,28 @@ //set render params Map<String, String[]> renderParams = ((PortalRequestContext)event.getRequestContext()).getPortletParameters(); - uiPortlet.setRenderParametersMap(renderParams); + uiPortlet.setNavigationalState(ParametersStateString.create(renderParams)); } } /** - * This method is called by the process action and render action listeners, - * aka during the processDecode() phase of our UI framework - * - * It goes throughs all the request parameters and add to the public render - * parameters Map the one that are supported by the targeted portlet + * This method is called by the process action and render action listeners, aka during the processDecode() phase of + * our UI framework + * <p/> + * It goes throughs all the request parameters and add to the public render parameters Map the one that are supported + * by the targeted portlet */ static public void setupPublicRenderParams(UIPortlet uiPortlet, Map<String, String[]> requestParams) { UIPortal uiPortal = Util.getUIPortal(); Map<String, String[]> publicParams = uiPortal.getPublicParameters(); - Iterator<String> keys = requestParams.keySet().iterator(); - while (keys.hasNext()) + for (String key : requestParams.keySet()) { - String key = keys.next(); if (uiPortlet.supportsPublicParam(key)) + { publicParams.put(key, requestParams.get(key)); + } } } @@ -654,7 +637,9 @@ String windowState = event.getRequestContext().getRequestParameter("portal:windowState"); //TODO TrongTT: We should use only parameter for change WindowState if (windowState == null) + { windowState = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID).trim(); + } UIPageBody uiPageBody = uiPortlet.getAncestorOfType(UIPageBody.class); UIPage uiPage = uiPortlet.getAncestorOfType(UIPage.class); if (windowState.equals(WindowState.MAXIMIZED.toString())) @@ -666,7 +651,9 @@ // reference: UIPortalLifecycle, UIPageLifecycle, renderChildren() in UIPageBody //--------------------------------------------------------- if (uiPage != null && uiPage.isShowMaxWindow()) + { uiPage.setMaximizedUIPortlet(uiPortlet); + } //--------------------------------------------------------- uiPageBody.setMaximizedUIComponent(uiPortlet); } @@ -680,7 +667,9 @@ { UIPortlet maxPortlet = (UIPortlet)uiPageBody.getMaximizedUIComponent(); if (maxPortlet == uiPortlet) + { uiPageBody.setMaximizedUIComponent(null); + } } //TODO dang.tung: for ShowMaxWindow situation //---------------------------------------------------------------- @@ -688,7 +677,9 @@ { UIPortlet maxPortlet = (UIPortlet)uiPage.getMaximizedUIPortlet(); if (maxPortlet == uiPortlet) + { uiPage.setMaximizedUIPortlet(null); + } } //----------------------------------------------------------------- if (windowState.equals(WindowState.MINIMIZED.toString())) @@ -701,10 +692,7 @@ } } - /** - * This listener is called when the portlet mode of a portlet has to be - * changed. - */ + /** This listener is called when the portlet mode of a portlet has to be changed. */ static public class ChangePortletModeActionListener extends EventListener<UIPortlet> { public void execute(Event<UIPortlet> event) throws Exception @@ -713,7 +701,9 @@ String portletMode = event.getRequestContext().getRequestParameter("portal:portletMode"); //TODO TrongTT: We should use only parameter for change PortletMode if (portletMode == null) + { portletMode = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); + } log.info("Change portlet mode of " + uiPortlet.getPortletContext().getId() + " to " + portletMode); if (portletMode.equals(PortletMode.HELP.toString())) @@ -733,10 +723,9 @@ } /** - * This listener is called when the portlet edit form (which tells information - * about the portlet width or height as well as if the info bar and its - * content should be shown) is invoked. - * + * This listener is called when the portlet edit form (which tells information about the portlet width or height as + * well as if the info bar and its content should be shown) is invoked. + * <p/> * It places the form in the portal black mask */ static public class EditPortletActionListener extends EventListener<UIPortlet> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -24,6 +24,8 @@ import org.exoplatform.portal.pc.ExoPortletState; import org.exoplatform.portal.pom.spi.portlet.Preference; import org.exoplatform.portal.pom.spi.portlet.Preferences; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.portal.pom.spi.wsrp.WSRPPortletStateType; import org.exoplatform.portal.portlet.PortletExceptionHandleService; import org.exoplatform.portal.resource.SkinService; import org.exoplatform.portal.webui.util.Util; @@ -41,8 +43,8 @@ import org.exoplatform.webui.core.lifecycle.UIContainerLifecycle; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; +import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.form.UIFormCheckBoxInput; import org.exoplatform.webui.form.UIFormInputIconSelector; import org.exoplatform.webui.form.UIFormInputInfo; @@ -63,6 +65,8 @@ import org.gatein.pc.api.invocation.response.ErrorResponse; import org.gatein.pc.api.invocation.response.FragmentResponse; import org.gatein.pc.api.invocation.response.PortletInvocationResponse; +import org.gatein.pc.api.spi.InstanceContext; +import org.gatein.pc.api.state.AccessMode; import org.gatein.pc.api.state.PropertyChange; import org.gatein.pc.portlet.impl.spi.AbstractClientContext; import org.gatein.pc.portlet.impl.spi.AbstractPortalContext; @@ -71,21 +75,15 @@ import org.gatein.pc.portlet.impl.spi.AbstractUserContext; import org.gatein.pc.portlet.impl.spi.AbstractWindowContext; +import javax.portlet.PortletMode; +import javax.servlet.http.Cookie; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.ResourceBundle; -import javax.portlet.PortletMode; -import javax.servlet.http.Cookie; - -/** - * Author : Nhu Dinh Thuan - * nhudinhthuan(a)yahoo.com - * Jun 8, 2006 - */ +/** Author : Nhu Dinh Thuan nhudinhthuan(a)yahoo.com Jun 8, 2006 */ @ComponentConfigs({ @ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/portal/webui/portal/UIPortletForm.gtmpl", events = { @EventConfig(listeners = UIPortletForm.SaveActionListener.class), @@ -111,21 +109,21 @@ addUIFormInput(uiPortletPrefSet); UIFormInputSet uiSettingSet = new UIFormInputSet("PortletSetting"); uiSettingSet. - /*addUIFormInput(new UIFormStringInput("id", "id", null). + /*addUIFormInput(new UIFormStringInput("id", "id", null). addValidator(MandatoryValidator.class).setEditable(false)). addUIFormInput(new UIFormStringInput("windowId", "windowId", null).setEditable(false)).*/ - addUIFormInput(new UIFormInputInfo("displayName", "displayName", null)).addUIFormInput( + addUIFormInput(new UIFormInputInfo("displayName", "displayName", null)).addUIFormInput( new UIFormStringInput("title", "title", null).addValidator(StringLengthValidator.class, 3, 60)) .addUIFormInput( new UIFormStringInput("width", "width", null).addValidator(ExpressionValidator.class, "(^([1-9]\\d*)px$)?", "UIPortletForm.msg.InvalidWidthHeight")).addUIFormInput( - new UIFormStringInput("height", "height", null).addValidator(ExpressionValidator.class, - "(^([1-9]\\d*)px$)?", "UIPortletForm.msg.InvalidWidthHeight")).addUIFormInput( - new UIFormCheckBoxInput("showInfoBar", "showInfoBar", false)).addUIFormInput( - new UIFormCheckBoxInput("showPortletMode", "showPortletMode", false)).addUIFormInput( - new UIFormCheckBoxInput("showWindowState", "showWindowState", false)).addUIFormInput( - new UIFormTextAreaInput("description", "description", null).addValidator(StringLengthValidator.class, 0, - 255)); + new UIFormStringInput("height", "height", null).addValidator(ExpressionValidator.class, + "(^([1-9]\\d*)px$)?", "UIPortletForm.msg.InvalidWidthHeight")).addUIFormInput( + new UIFormCheckBoxInput("showInfoBar", "showInfoBar", false)).addUIFormInput( + new UIFormCheckBoxInput("showPortletMode", "showPortletMode", false)).addUIFormInput( + new UIFormCheckBoxInput("showWindowState", "showWindowState", false)).addUIFormInput( + new UIFormTextAreaInput("description", "description", null).addValidator(StringLengthValidator.class, 0, + 255)); addUIFormInput(uiSettingSet); UIFormInputIconSelector uiIconSelector = new UIFormInputIconSelector("Icon", "icon"); addUIFormInput(uiIconSelector); @@ -170,21 +168,36 @@ { PortalRequestContext prcontext = (PortalRequestContext)WebuiRequestContext.getCurrentInstance(); prcontext.setFullRender(true); - PortletInvoker portletInvoker = getApplicationComponent(PortletInvoker.class); - StatefulPortletContext<ExoPortletState> portletContext = uiPortlet_.getPortletContext(); + StatefulPortletContext portletContext = uiPortlet_.getPortletContext(); ExoPortletInvocationContext portletInvocationContext = new ExoPortletInvocationContext(prcontext, uiPortlet_); - List<Cookie> requestCookies = new ArrayList<Cookie>(); - for (Cookie cookie : prcontext.getRequest().getCookies()) - { - requestCookies.add(cookie); - } + List<Cookie> requestCookies = new ArrayList<Cookie>(Arrays.asList(prcontext.getRequest().getCookies())); RenderInvocation renderInvocation = new RenderInvocation(portletInvocationContext); renderInvocation.setClientContext(new AbstractClientContext(prcontext.getRequest(), requestCookies)); renderInvocation.setServerContext(new AbstractServerContext(prcontext.getRequest(), prcontext.getResponse())); - renderInvocation.setInstanceContext(new ExoPortletInstanceContext(portletContext.getState().getPortletId())); + + + // instance context + InstanceContext instanceContext; + if (portletContext.getType() instanceof WSRPPortletStateType) + { + WSRP wsrp = (WSRP)portletContext.getState(); + AccessMode accessMode = AccessMode.CLONE_BEFORE_WRITE; + if (wsrp.isCloned()) + { + accessMode = AccessMode.READ_WRITE; + } + instanceContext = new ExoPortletInstanceContext(wsrp.getPortletId(), accessMode); + } + else + { + ExoPortletState exo = (ExoPortletState)portletContext.getState(); + instanceContext = new ExoPortletInstanceContext(exo.getPortletId()); + } + renderInvocation.setInstanceContext(instanceContext); + renderInvocation.setUserContext(new AbstractUserContext(prcontext.getRequest())); renderInvocation.setWindowContext(new AbstractWindowContext(uiPortlet_.getWindowId())); renderInvocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap( @@ -321,25 +334,6 @@ uiPortlet_.update(propertyChanges); } - private Map<String, String[]> getRenderParameterMap(UIPortlet uiPortlet) - { - Map<String, String[]> renderParams = uiPortlet.getRenderParametersMap(); - - if (renderParams == null) - { - renderParams = new HashMap<String, String[]>(); - uiPortlet.setRenderParametersMap(renderParams); - } - - /* - * handle public params to only get the one supported by the targeted portlet - */ - Map<String, String[]> allParams = new HashMap<String, String[]>(renderParams); - allParams.putAll(uiPortlet.getPublicParameters()); - - return allParams; - } - static public class SaveActionListener extends EventListener<UIPortletForm> { public void execute(final Event<UIPortletForm> event) throws Exception Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/javascript ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/login ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -55,9 +55,7 @@ import java.util.Locale; import java.util.ResourceBundle; -/** - * Copied by The eXo Platform SARL Author May 28, 2009 3:07:15 PM - */ +/** Copied by The eXo Platform SARL Author May 28, 2009 3:07:15 PM */ @ComponentConfigs({ @ComponentConfig(template = "system:/groovy/portal/webui/navigation/UINavigationNodeSelector.gtmpl", events = {@EventConfig(listeners = UINavigationNodeSelector.ChangeNodeActionListener.class)}), @ComponentConfig(id = "NavigationNodePopupMenu", type = UIRightClickPopupMenu.class, template = "system:/groovy/webui/core/UIRightClickPopupMenu.gtmpl", events = { @@ -138,17 +136,23 @@ private void selectNavigation() { if (navigations == null || navigations.size() < 1) + { return; + } if (selectedNode == null) { PageNavigation navigation = navigations.get(0); selectedNode = new SelectedNode(navigation, null, null); if (navigation.getNodes().size() > 0) + { selectedNode.setNode(navigation.getNodes().get(0)); + } } selectNavigation(selectedNode.getPageNavigation().getId()); if (selectedNode.getNode() != null) + { selectPageNodeByUri(selectedNode.getNode().getUri()); + } } public void selectNavigation(int id) @@ -156,7 +160,9 @@ for (int i = 0; i < navigations.size(); i++) { if (navigations.get(i).getId() != id) + { continue; + } selectedNode = new SelectedNode(navigations.get(i), null, null); selectPageNodeByUri(null); UITree uiTree = getChild(UITree.class); @@ -171,7 +177,9 @@ for (PageNavigation nav : navigations) { if (nav.getOwnerType().equals(PortalConfig.USER_TYPE)) + { continue; + } String ownerId = nav.getOwnerId(); if (nav.getOwnerType().equals(PortalConfig.GROUP_TYPE)) { @@ -190,7 +198,9 @@ { node.setResolvedLabel(res); if (node.getChildren() == null) + { return; + } for (PageNode childNode : node.getChildren()) { resolveLabel(res, childNode); @@ -200,7 +210,9 @@ public void selectPageNodeByUri(String uri) { if (selectedNode == null) + { return; + } UITree tree = getChild(UITree.class); List<?> sibbling = tree.getSibbling(); tree.setSibbling(null); @@ -220,16 +232,22 @@ public PageNode searchPageNodeByUri(PageNavigation pageNav, String uri) { if (pageNav == null || uri == null) + { return null; + } List<PageNode> pageNodes = pageNav.getNodes(); UITree uiTree = getChild(UITree.class); for (PageNode ele : pageNodes) { PageNode returnPageNode = searchPageNodeByUri(ele, uri, uiTree); if (returnPageNode == null) + { continue; + } if (uiTree.getSibbling() == null) + { uiTree.setSibbling(pageNodes); + } return returnPageNode; } return null; @@ -238,19 +256,29 @@ private PageNode searchPageNodeByUri(PageNode pageNode, String uri, UITree tree) { if (pageNode.getUri().equals(uri)) + { return pageNode; + } List<PageNode> children = pageNode.getChildren(); if (children == null) + { return null; + } for (PageNode ele : children) { PageNode returnPageNode = searchPageNodeByUri(ele, uri, tree); if (returnPageNode == null) + { continue; + } if (tree.getSibbling() == null) + { tree.setSibbling(children); + } if (tree.getParentSelected() == null) + { tree.setParentSelected(pageNode); + } selectedNode.setParentNode(pageNode); return returnPageNode; } @@ -260,14 +288,18 @@ public List<PageNavigation> getPageNavigations() { if (navigations == null) + { navigations = new ArrayList<PageNavigation>(); + } return navigations; } public void addPageNavigation(PageNavigation navigation) { if (navigations == null) + { navigations = new ArrayList<PageNavigation>(); + } navigations.add(navigation); updateUI(); } @@ -275,7 +307,9 @@ public void deletePageNavigation(PageNavigation navigation) { if (navigations == null || navigations.size() < 1) + { return; + } navigations.remove(navigation); deleteNavigations.add(navigation); selectedNode = null; @@ -288,7 +322,9 @@ for (PageNavigation ele : getPageNavigations()) { if (ele.getId() == id) + { return ele; + } } return null; } @@ -299,9 +335,13 @@ if (uiPopupMenu != null) { if (navigations == null || navigations.size() < 1) + { uiPopupMenu.setRendered(false); + } else + { uiPopupMenu.setRendered(true); + } } super.processRender(context); } @@ -354,11 +394,15 @@ { parent = PageNavigationUtils.searchPageNodeByUri(pageNode, uri); if (parent != null) + { break; + } } } if (parent == null) + { parent = uiNodeSelector.getSelectedNavigation(); + } uiNodeForm.setSelectedParent(parent); // set navigation owner, navigation type @@ -391,7 +435,9 @@ { selectedPageNode = PageNavigationUtils.searchPageNodeByUri(pageNode, uri); if (selectedPageNode != null) + { break; + } } } @@ -462,18 +508,19 @@ UserACL userACL = uiApp.getApplicationComponent(UserACL.class); if (!userACL.hasPermission(node)) { - uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.UserNotPermission", new String[]{pageId}, 1));; + uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.UserNotPermission", new String[]{pageId}, 1)); + ; return; } } UIPopupWindow uiManagementPopup = uiNodeSelector.getAncestorOfType(UIPopupWindow.class); UIPageNodeForm2 uiNodeForm = uiApp.createUIComponent(UIPageNodeForm2.class, null, null); uiManagementPopup.setUIComponent(uiNodeForm); - + // set navigation owner, navigation type uiNodeForm.setOwner(uiNodeSelector.getSelectedNavigation().getOwnerId()); uiNodeForm.setOwnerType(uiNodeSelector.getSelectedNavigation().getOwnerType()); - + uiNodeForm.setValues(selectedNode); uiNodeForm.setSelectedParent(obj); uiManagementPopup.setWindowSize(800, 500); @@ -494,10 +541,14 @@ PageNavigation nav = uiNodeSelector.getSelectedNavigation(); if (nav == null) + { return; + } PageNode[] pageNodes = PageNavigationUtils.searchPageNodesByUri(nav, uri); if (pageNodes == null) + { return; + } SelectedNode selectedNode = new SelectedNode(nav, pageNodes[0], pageNodes[1]); selectedNode.setDeleteNode(false); uiNodeSelector.setCopyNode(selectedNode); @@ -514,7 +565,9 @@ super.execute(event); UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class); if (uiNodeSelector.getCopyNode() == null) + { return; + } uiNodeSelector.getCopyNode().setDeleteNode(true); } } @@ -542,7 +595,9 @@ event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement); SelectedNode selectedNode = uiNodeSelector.getCopyNode(); if (selectedNode == null) + { return; + } PageNode newNode = selectedNode.getNode().clone(); PageNavigation targetNav = uiNodeSelector.getSelectedNavigation(); @@ -615,7 +670,9 @@ } List<PageNode> children = node.getChildren(); if (children == null || children.size() < 1) + { return; + } for (PageNode ele : children) { clonePageFromNode(ele, ownerType, ownerId, service); @@ -628,14 +685,20 @@ child.setUri(newUri); List<PageNode> children = child.getChildren(); if (children != null) + { for (PageNode node : children) + { setNewUri(child, node); + } + } } private boolean isExistChild(PageNode parent, PageNode child) { if (parent == null) + { return false; + } List<PageNode> nodes = parent.getChildren(); if (nodes == null) { @@ -645,7 +708,9 @@ for (PageNode node : nodes) { if (node.getName().equals(child.getName())) + { return true; + } } return false; } @@ -654,11 +719,15 @@ { List<PageNode> nodes = nav.getNodes(); if (nodes.size() == 0) + { return false; + } for (PageNode node : nodes) { if (node.getName().equals(child.getName())) + { return true; + } } return false; } @@ -690,11 +759,17 @@ } int k = children.indexOf(targetNode); if (k < 0) + { return; + } if (k == 0 && i == -1) + { return; + } if (k == children.size() - 1 && i == 1) + { return; + } children.remove(k); children.add(k + i, targetNode); } @@ -719,11 +794,15 @@ PageNavigation nav = uiNodeSelector.getSelectedNavigation(); if (nav == null) + { return; + } PageNode[] pageNodes = PageNavigationUtils.searchPageNodesByUri(nav, uri); if (pageNodes == null) + { return; + } if (pageNodes[0] == null) { Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page ___________________________________________________________________ Name: svn:ignore + *.iml .idea 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 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -44,17 +44,11 @@ import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; +import javax.portlet.WindowState; import java.util.ArrayList; import java.util.List; -import javax.portlet.WindowState; - -/** - * Created by The eXo Platform SAS - * Author : Tran The Trong - * trongtt(a)gmail.com - * Jun 14, 2006 - */ +/** Created by The eXo Platform SAS Author : Tran The Trong trongtt(a)gmail.com Jun 14, 2006 */ public class UIPageActionListener { @@ -93,7 +87,9 @@ List<PageNavigation> navigations = uiPortal.getNavigations(); String uri = pnevent.getTargetNodeUri(); if (uri == null || (uri = uri.trim()).length() < 1) + { return; + } if (uri.length() == 1 && uri.charAt(0) == '/') { for (PageNavigation nav : navigations) @@ -126,7 +122,9 @@ } } if (uri.charAt(0) == '/') + { uri = uri.substring(1); + } int idx = uri.lastIndexOf("::"); if (idx < 0) @@ -144,7 +142,9 @@ tempNode = tempNode.getChild(nodeNames[i]); } if (tempNode != null) + { selectedPaths_.add(selectedNode = tempNode); + } if (selectedNode != null) { @@ -155,7 +155,8 @@ // TODO tam.nguyen: filter navigation, select navigation up to user if (selectedNode == null) { - filter : for (PageNavigation nav : navigations) + filter: + for (PageNavigation nav : navigations) { for (PageNode child : nav.getNodes()) { @@ -169,7 +170,9 @@ } uiPortal.setSelectedNode(selectedNode); if (selectedNode == null) + { selectedPaths_.add(uiPortal.getSelectedNode()); + } uiPortal.setSelectedPaths(selectedPaths_); String selectedUri = (uiPortal.getSelectedNode() == null) ? null : uiPortal.getSelectedNode().getUri(); if (currentUri != null && !currentUri.equals(selectedUri)) @@ -210,7 +213,9 @@ tempNode = tempNode.getChild(nodeNames[i]); } if (tempNode != null) + { selectedPaths_.add(selecttedNode = tempNode); + } uiPortal.setSelectedNode(selecttedNode); uiPortal.setSelectedNavigation(nav); @@ -235,7 +240,7 @@ /** * Update the layout of UIPortal if both ownerType and ownerId of navigation are changed - * + * * @param uiPortal * @param formerNav * @param newNav @@ -243,7 +248,7 @@ * @throws Exception */ private void updateLayout(UIPortal uiPortal, PageNavigation formerNav, PageNavigation newNav, - UIPortalApplication uiPortalApp) throws Exception + UIPortalApplication uiPortalApp) throws Exception { if (formerNav == null || newNav == null) { @@ -272,7 +277,7 @@ /** * Rebuild UIPortal with updated UserPortalConfig - * + * * @param uiPortal * @param portalConfig * @throws Exception @@ -349,7 +354,9 @@ Page page = (Page)PortalDataMapper.buildModelObject(uiPage); UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class); if (page.getChildren() == null) + { page.setChildren(new ArrayList<ModelObject>()); + } configService.update(page); } break; @@ -375,7 +382,9 @@ Page page = (Page)PortalDataMapper.buildModelObject(uiPage); UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class); if (page.getChildren() == null) + { page.setChildren(new ArrayList<ModelObject>()); + } configService.update(page); pcontext.setFullRender(false); pcontext.setResponseComplete(true); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -51,10 +51,7 @@ import java.util.Date; import java.util.List; -/** - * Created by The eXo Platform SARL Author : Dang Van Minh minhdv81(a)yahoo.com - * Jun 23, 2006 - */ +/** Created by The eXo Platform SARL Author : Dang Van Minh minhdv81(a)yahoo.com Jun 23, 2006 */ @ComponentConfigs(@ComponentConfig(template = "system:/groovy/webui/core/UIWizard.gtmpl", events = { @EventConfig(listeners = UIPageCreationWizard.ViewStep1ActionListener.class), @EventConfig(listeners = UIPageCreationWizard.ViewStep2ActionListener.class), @@ -114,7 +111,9 @@ { List<PageNode> children = selectedNode.getChildren(); if (children == null) + { children = new ArrayList<PageNode>(); + } children.add(pageNode); selectedNode.setChildren((ArrayList<PageNode>)children); } @@ -122,7 +121,7 @@ { pageNav.addNode(pageNode); } - pageNav.setModifier(RequestContext.<WebuiRequestContext> getCurrentInstance().getRemoteUser()); + pageNav.setModifier(RequestContext.<WebuiRequestContext>getCurrentInstance().getRemoteUser()); uiNodeSelector.selectPageNodeByUri(pageNode.getUri()); service.create(page); @@ -153,9 +152,13 @@ PageNode selectedPageNode = uiPageSetInfo.getSelectedPageNode(); List<PageNode> sibbling = null; if (selectedPageNode != null) + { sibbling = selectedPageNode.getChildren(); + } else + { sibbling = navigation.getNodes(); + } if (sibbling != null) { for (PageNode ele : sibbling) @@ -220,7 +223,8 @@ if (navigation == null) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.notSelectedPageNavigation", - new String[]{}));; + new String[]{})); + ; uiWizard.viewStep(FIRST_STEP); return; } @@ -315,11 +319,15 @@ setDefaultPermission(page, ownerType, ownerId); if (page.getTitle() == null || page.getTitle().trim().length() == 0) + { page.setTitle(pageNode.getName()); + } boolean isDesktopPage = Page.DESKTOP_PAGE.equals(page.getFactoryId()); if (isDesktopPage) + { page.setShowMaxWindow(true); + } UIPagePreview uiPagePreview = uiWizard.getChild(UIPagePreview.class); UIPage uiPage; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -33,9 +33,7 @@ import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; -/** - * Created by The eXo Platform SAS Mar 21, 2007 - */ +/** Created by The eXo Platform SAS Mar 21, 2007 */ public abstract class UIPageWizard extends UIWizard { Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2009-11-09 11:58:06 UTC (rev 529) @@ -194,18 +194,8 @@ for (int i = 0; i < navigations.size(); i++) { PageNavigation ele = navigations.get(i); - PageNavigation temp = serv.getPageNavigation(ele.getOwnerType(), ele.getOwnerId()); - if (temp != null) + if (serv.getPageNavigation(ele.getOwnerType(), ele.getOwnerId()) == null) { - if (temp.getSerialMark() != ele.getSerialMark()) - { - temp.setModifiable(ele.isModifiable()); - localizePageNavigation(temp); - navigations.set(i, temp); - } - } - else - { navigations.remove(i); --i; } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -57,10 +57,7 @@ import java.util.List; -/** - * Created by The eXo Platform SAS Author : Pham Thanh Tung - * thanhtungty(a)gmail.com Jun 10, 2009 - */ +/** Created by The eXo Platform SAS Author : Pham Thanh Tung thanhtungty(a)gmail.com Jun 10, 2009 */ @ComponentConfigs({ @ComponentConfig(template = "app:/groovy/portal/webui/portal/UIPortalComposer.gtmpl", events = { @EventConfig(listeners = UIPortalComposer.ViewPropertiesActionListener.class), @@ -97,7 +94,9 @@ public void setPortalMode(int mode) { if (mode < 0 || mode > 4) + { return; + } getAncestorOfType(UIPortalApplication.class).setModeState(mode); } @@ -163,7 +162,9 @@ LocaleConfigService localeConfigService = uiPortalApp.getApplicationComponent(LocaleConfigService.class); LocaleConfig localeConfig = localeConfigService.getLocaleConfig(portalConfig.getLocale()); if (localeConfig == null) + { localeConfig = localeConfigService.getDefaultLocaleConfig(); + } // TODO dang.tung - change layout when portal get language from UIPortal // (user and browser not support) // ---------------------------------------------------------------------------------------------------- @@ -197,16 +198,22 @@ for (UIComponent child : children) { if (!child.isRendered() || child.getClass().equals(UIPortalComposer.class)) + { continue; + } rcontext.addUIComponentToUpdateByAjax(child); } int portalMode = uiApp.getModeState(); if (portalMode != UIPortalApplication.NORMAL_MODE) { if (portalMode % 2 != 0) + { Util.showComponentLayoutMode(UIPortlet.class); + } else + { Util.showComponentEditInViewMode(UIPortlet.class); + } } JavascriptManager jsManager = Util.getPortalRequestContext().getJavascriptManager(); jsManager.addJavascript("eXo.portal.portalMode=" + portalMode + ";"); @@ -303,7 +310,9 @@ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); if (uri == null) + { uri = (uiPortal.getSelectedNode() != null) ? uiPortal.getSelectedNode().getUri() : null; + } PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri); uiPortal.broadcast(pnevent, Event.Phase.PROCESS); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); @@ -334,21 +343,29 @@ String uri = null; if (uiPortal == null) + { siteBody.setUIComponent(editPortal); + } // uiEditWS.setUIComponent(null); // uiWorkingWS.removeChild(UIEditInlineWorkspace.class); uiWorkingWS.getChild(UIEditInlineWorkspace.class).setRendered(false); uiPortal = (UIPortal)siteBody.getUIComponent(); if (PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())) + { uiPortalApp.setSessionOpen(true); + } else + { uiPortalApp.setSessionOpen(false); + } uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); if (uri == null) + { uri = uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null; + } PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri); uiPortal.broadcast(pnevent, Event.Phase.PROCESS); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); @@ -409,19 +426,19 @@ switch (portalMode) { - case UIPortalApplication.APP_BLOCK_EDIT_MODE : + case UIPortalApplication.APP_BLOCK_EDIT_MODE: uiPortalApp.setModeState(UIPortalApplication.APP_VIEW_EDIT_MODE); break; - case UIPortalApplication.APP_VIEW_EDIT_MODE : + case UIPortalApplication.APP_VIEW_EDIT_MODE: uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); break; - case UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE : + case UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE: uiPortalApp.setModeState(UIPortalApplication.CONTAINER_VIEW_EDIT_MODE); break; - case UIPortalApplication.CONTAINER_VIEW_EDIT_MODE : + case UIPortalApplication.CONTAINER_VIEW_EDIT_MODE: uiPortalApp.setModeState(UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE); break; - default : + default: uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); return; } @@ -519,9 +536,13 @@ UIPortal uiPortal = Util.getUIPortal(); UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); if (PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())) + { uiPortalApp.setSessionOpen(true); + } else + { uiPortalApp.setSessionOpen(false); + } uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -28,6 +28,7 @@ import org.exoplatform.portal.config.model.PortalProperties; import org.exoplatform.portal.resource.SkinService; import org.exoplatform.portal.webui.util.PortalDataMapper; +import org.exoplatform.portal.webui.util.PortalDataMapper; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; import org.exoplatform.portal.webui.workspace.UIPortalApplication; @@ -49,8 +50,8 @@ import org.exoplatform.webui.core.model.SelectItemCategory; import org.exoplatform.webui.core.model.SelectItemOption; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.form.UIFormInputItemSelector; import org.exoplatform.webui.form.UIFormInputSet; import org.exoplatform.webui.form.UIFormSelectBox; @@ -60,8 +61,8 @@ import org.exoplatform.webui.form.validator.MandatoryValidator; import org.exoplatform.webui.form.validator.StringLengthValidator; import org.exoplatform.webui.organization.UIListPermissionSelector; +import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; import org.exoplatform.webui.organization.UIPermissionSelector; -import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; import java.util.ArrayList; import java.util.Collection; @@ -104,14 +105,16 @@ setSelectedTab(uiTemplateInput.getId()); createDefaultItem(); - UIFormInputSet uiPortalSetting = this.<UIFormInputSet> getChildById("PortalSetting"); + UIFormInputSet uiPortalSetting = this.<UIFormInputSet>getChildById("PortalSetting"); UIFormStringInput uiNameInput = uiPortalSetting.getUIStringInput(FIELD_NAME); uiNameInput.setEditable(true); setActions(new String[]{"Save", "Close"}); if (initParams == null) + { return; + } WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); Param param = initParams.getParam("PortalTemplateConfigOption"); List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getMapGroovyObject(context); @@ -181,7 +184,9 @@ { SelectItemOption<String> skinOption = new SelectItemOption<String>(skin, skin); if (uiPortal.getSkin().equals(skin)) + { skinOption.setSelected(true); + } listSkin.add(skinOption); } UIFormSelectBox uiSelectBox = new UIFormSelectBox(FIELD_SKIN, FIELD_SKIN, listSkin); @@ -238,9 +243,9 @@ UIPortal uiPortal = Util.getUIPortal(); uiForm.invokeSetBindingBean(uiPortal); //uiPortal.refreshNavigation(localeConfigService.getLocaleConfig(uiPortal.getLocale()).getLocale()) ; - PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(uiPortal); if (uiPortalApp.getModeState() == UIPortalApplication.NORMAL_MODE) { + PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(uiPortal); UserPortalConfigService configService = uiForm.getApplicationComponent(UserPortalConfigService.class); configService.update(portalConfig); } Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java 2009-11-09 11:39:22 UTC (rev 528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java 2009-11-09 11:58:06 UTC (rev 529) @@ -1,16 +1,16 @@ /** * Copyright (C) 2009 eXo Platform SAS. - * + * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -24,15 +24,13 @@ import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.core.UIComponentDecorator; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; -/** - * Created by The eXo Platform SAS - * Mar 13, 2007 - */ -@ComponentConfig(id = "UIMaskWorkspace", template = "system:/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl", - events = @EventConfig(phase = Phase.DECODE, listeners = UIMaskWorkspace.CloseActionListener.class)) +/** Created by The eXo Platform SAS Mar 13, 2007 */ +@ComponentConfig(id = "UIMaskWorkspace", template = "system:/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl", + events = @EventConfig(phase = Phase.DECODE, listeners = UIMaskWorkspace.CloseActionListener.class)) public class UIMaskWorkspace extends UIComponentDecorator { @@ -69,7 +67,9 @@ { this.isShow = bln; if (bln == false) + { isUpdated = false; + } } public boolean isUpdated() @@ -115,7 +115,9 @@ uiMaskWorkspace = uiSource.getAncestorOfType(UIMaskWorkspace.class); } if (uiMaskWorkspace == null || !uiMaskWorkspace.isShow()) + { return; + } uiMaskWorkspace.setUIComponent(null); uiMaskWorkspace.setWindowSize(-1, -1); event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace); Property changes on: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/pool ___________________________________________________________________ Name: svn:ignore + *.iml .idea