November 2009 - gatein-commits - Jboss List Archives

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

by do-not-reply＠jboss.org

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/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"?>  +<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

15 years, 1 month

1
0
0 / 0

gatein SVN: r528 - in portal/trunk: component/application-registry and 655 other directories.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2009-11-09 06:39:22 -0500 (Mon, 09 Nov 2009) New Revision: 528 Added: portal/trunk/component/portal/src/main/java/conf/portal/content-nodetypes.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRP.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPPortletStateType.java portal/trunk/component/portal/src/test/java/conf/portal/content-nodetypes.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java Modified: portal/trunk/component/ portal/trunk/component/application-registry/ portal/trunk/component/application-registry/src/ portal/trunk/component/application-registry/src/main/ portal/trunk/component/application-registry/src/main/java/ portal/trunk/component/application-registry/src/main/java/conf/ portal/trunk/component/application-registry/src/main/java/conf/portal/ portal/trunk/component/application-registry/src/main/java/org/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/jcr/ portal/trunk/component/application-registry/src/test/ portal/trunk/component/application-registry/src/test/java/ portal/trunk/component/application-registry/src/test/java/conf/ portal/trunk/component/application-registry/src/test/java/conf/portal/ portal/trunk/component/application-registry/src/test/java/org/ portal/trunk/component/application-registry/src/test/java/org/exoplatform/ portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/ portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/gadget/ portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/registry/ portal/trunk/component/common/ portal/trunk/component/common/src/ portal/trunk/component/common/src/main/ portal/trunk/component/common/src/main/java/ portal/trunk/component/common/src/main/java/org/ portal/trunk/component/common/src/main/java/org/exoplatform/ portal/trunk/component/common/src/main/java/org/exoplatform/commons/ portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/ portal/trunk/component/common/src/main/java/org/exoplatform/services/ portal/trunk/component/common/src/main/java/org/exoplatform/services/config/ portal/trunk/component/common/src/main/java/org/exoplatform/services/resources/ portal/trunk/component/common/src/main/java/org/exoplatform/services/resources/impl/ portal/trunk/component/common/src/main/java/org/exoplatform/services/resources/impl/hibernate/ portal/trunk/component/common/src/main/resources/ portal/trunk/component/common/src/test/ portal/trunk/component/common/src/test/java/ portal/trunk/component/common/src/test/java/org/ portal/trunk/component/common/src/test/java/org/exoplatform/ portal/trunk/component/common/src/test/java/org/exoplatform/commons/ portal/trunk/component/common/src/test/java/org/exoplatform/commons/utils/ portal/trunk/component/common/src/test/java/org/exoplatform/services/ portal/trunk/component/common/src/test/java/org/exoplatform/services/resources/ portal/trunk/component/common/src/test/java/org/exoplatform/services/resources/impl/ portal/trunk/component/common/src/test/resources/ portal/trunk/component/common/src/test/resources/locale/ portal/trunk/component/common/src/test/resources/locale/test/ portal/trunk/component/common/src/test/resources/resources/ portal/trunk/component/dashboard/ portal/trunk/component/dashboard/src/ portal/trunk/component/dashboard/src/main/ portal/trunk/component/dashboard/src/main/java/ portal/trunk/component/dashboard/src/main/java/org/ portal/trunk/component/dashboard/src/main/java/org/exoplatform/ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java portal/trunk/component/dashboard/src/main/resources/ portal/trunk/component/dashboard/src/main/resources/conf/ portal/trunk/component/dashboard/src/main/resources/conf/uiconf/ portal/trunk/component/dashboard/src/main/resources/conf/uiconf/dashboard/ portal/trunk/component/dashboard/src/main/resources/conf/uiconf/dashboard/webui/ portal/trunk/component/dashboard/src/main/resources/conf/uiconf/dashboard/webui/container/ portal/trunk/component/dashboard/src/main/resources/groovy/ portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/ portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/ portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/ portal/trunk/component/identity/ portal/trunk/component/identity/src/ portal/trunk/component/identity/src/main/ portal/trunk/component/identity/src/main/java/ portal/trunk/component/identity/src/main/java/conf/ portal/trunk/component/identity/src/main/java/conf/portal/ portal/trunk/component/identity/src/main/java/org/ portal/trunk/component/identity/src/main/java/org/exoplatform/ portal/trunk/component/identity/src/main/java/org/exoplatform/services/ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/jbidm/ portal/trunk/component/identity/src/test/ portal/trunk/component/identity/src/test/java/ portal/trunk/component/identity/src/test/java/conf/ portal/trunk/component/identity/src/test/java/conf/portal/ portal/trunk/component/identity/src/test/java/org/ portal/trunk/component/identity/src/test/java/org/exoplatform/ portal/trunk/component/identity/src/test/java/org/exoplatform/services/ portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/ portal/trunk/component/pc/ portal/trunk/component/pc/src/ portal/trunk/component/pc/src/main/ portal/trunk/component/pc/src/main/java/ portal/trunk/component/pc/src/main/java/org/ portal/trunk/component/pc/src/main/java/org/exoplatform/ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java portal/trunk/component/pc/src/main/java/org/exoplatform/services/ portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/ portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/bundle/ portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/impl/ portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/impl/servlet/ portal/trunk/component/pc/src/main/resources/ portal/trunk/component/pc/src/test/ portal/trunk/component/pc/src/test/java/ portal/trunk/component/pc/src/test/resources/ portal/trunk/component/portal/ portal/trunk/component/portal/src/ portal/trunk/component/portal/src/main/ portal/trunk/component/portal/src/main/java/ portal/trunk/component/portal/src/main/java/conf/ portal/trunk/component/portal/src/main/java/conf/portal/ portal/trunk/component/portal/src/main/java/conf/portal/model-nodetypes.xml portal/trunk/component/portal/src/main/java/org/ portal/trunk/component/portal/src/main/java/org/exoplatform/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/application/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/gadget/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/portlet/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp/WSRPApplication.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletPreferencesState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/portlet/ portal/trunk/component/portal/src/main/resources/ portal/trunk/component/portal/src/test/ portal/trunk/component/portal/src/test/java/ portal/trunk/component/portal/src/test/java/conf/ portal/trunk/component/portal/src/test/java/conf/portal/ portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml portal/trunk/component/portal/src/test/java/org/ portal/trunk/component/portal/src/test/java/org/exoplatform/ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/security/ portal/trunk/component/portal/src/test/resources/ portal/trunk/component/portal/src/test/resources/jibx/ portal/trunk/component/portal/src/test/resources/portal/ portal/trunk/component/portal/src/test/resources/portal/group/ portal/trunk/component/portal/src/test/resources/portal/group/organization/ portal/trunk/component/portal/src/test/resources/portal/group/organization/management/ portal/trunk/component/portal/src/test/resources/portal/group/organization/management/executive-board/ portal/trunk/component/portal/src/test/resources/portal/group/platform/ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/ portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/ portal/trunk/component/portal/src/test/resources/portal/group/platform/users/ portal/trunk/component/portal/src/test/resources/portal/portal/ portal/trunk/component/portal/src/test/resources/portal/portal/classic/ portal/trunk/component/portal/src/test/resources/portal/portal/template/ portal/trunk/component/portal/src/test/resources/portal/portal/template/classic/ portal/trunk/component/portal/src/test/resources/portal/portal/template/test/ portal/trunk/component/portal/src/test/resources/portal/portal/test/ portal/trunk/component/portal/src/test/resources/portal/template/ portal/trunk/component/portal/src/test/resources/portal/template/containers/ portal/trunk/component/portal/src/test/resources/portal/template/containers/four-columns/ portal/trunk/component/portal/src/test/resources/portal/template/containers/one-column/ portal/trunk/component/portal/src/test/resources/portal/template/containers/three-columns/ portal/trunk/component/portal/src/test/resources/portal/template/containers/two-columns/ portal/trunk/component/portal/src/test/resources/portal/template/pages/ portal/trunk/component/portal/src/test/resources/portal/template/pages/dashboard/ portal/trunk/component/portal/src/test/resources/portal/template/pages/empty/ portal/trunk/component/portal/src/test/resources/portal/template/pages/one-row-two-columns/ portal/trunk/component/portal/src/test/resources/portal/template/pages/three-columns/ portal/trunk/component/portal/src/test/resources/portal/template/pages/three-rows-two-columns/ portal/trunk/component/portal/src/test/resources/portal/template/pages/three-rows/ portal/trunk/component/portal/src/test/resources/portal/template/pages/three-tabs/ portal/trunk/component/portal/src/test/resources/portal/template/pages/two-columns-one-row/ portal/trunk/component/portal/src/test/resources/portal/template/pages/two-columns/ portal/trunk/component/portal/src/test/resources/portal/template/pages/two-rows/ portal/trunk/component/portal/src/test/resources/portal/template/pages/two-tabs/ portal/trunk/component/portal/src/test/resources/portal/user/ portal/trunk/component/portal/src/test/resources/portal/user/demo/ portal/trunk/component/portal/src/test/resources/portal/user/john/ portal/trunk/component/portal/src/test/resources/portal/user/mary/ portal/trunk/component/portal/src/test/resources/portal/user/overwritelayout/ portal/trunk/component/portal/src/test/resources/portal/user/root/ portal/trunk/component/portal/src/test/resources/portal/user/template/ portal/trunk/component/portal/src/test/resources/portal/user/template/user/ portal/trunk/component/resources/ portal/trunk/component/resources/src/ portal/trunk/component/resources/src/main/ portal/trunk/component/resources/src/main/java/ portal/trunk/component/resources/src/main/java/conf/ portal/trunk/component/resources/src/main/java/conf/portal/ portal/trunk/component/resources/src/main/java/org/ portal/trunk/component/resources/src/main/java/org/exoplatform/ portal/trunk/component/resources/src/main/java/org/exoplatform/services/ portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/ portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/jcr/ portal/trunk/component/resources/src/test/ portal/trunk/component/resources/src/test/java/ portal/trunk/component/resources/src/test/java/conf/ portal/trunk/component/resources/src/test/java/conf/portal/ portal/trunk/component/resources/src/test/java/conf/portal/testjcr/ portal/trunk/component/resources/src/test/java/locale/ portal/trunk/component/resources/src/test/java/locale/test/ portal/trunk/component/resources/src/test/java/locale/test/resources/ portal/trunk/component/resources/src/test/java/org/ portal/trunk/component/resources/src/test/java/org/exoplatform/ portal/trunk/component/resources/src/test/java/org/exoplatform/services/ portal/trunk/component/resources/src/test/java/org/exoplatform/services/resources/ portal/trunk/component/resources/src/test/java/org/exoplatform/services/resources/test/ portal/trunk/component/scripting/ portal/trunk/component/scripting/src/ portal/trunk/component/scripting/src/main/ portal/trunk/component/scripting/src/main/java/ portal/trunk/component/scripting/src/main/java/conf/ portal/trunk/component/scripting/src/main/java/conf/portal/ portal/trunk/component/scripting/src/main/java/org/ portal/trunk/component/scripting/src/main/java/org/exoplatform/ portal/trunk/component/scripting/src/main/java/org/exoplatform/commons/ portal/trunk/component/scripting/src/main/java/org/exoplatform/commons/utils/ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/ portal/trunk/component/scripting/src/main/java/org/exoplatform/resolver/ portal/trunk/component/scripting/src/test/ portal/trunk/component/scripting/src/test/java/ portal/trunk/component/scripting/src/test/java/org/ portal/trunk/component/scripting/src/test/java/org/exoplatform/ portal/trunk/component/scripting/src/test/java/org/exoplatform/commons/ portal/trunk/component/scripting/src/test/java/org/exoplatform/commons/utils/ portal/trunk/component/web/ portal/trunk/component/web/src/ portal/trunk/component/web/src/main/ portal/trunk/component/web/src/main/java/ portal/trunk/component/web/src/main/java/conf/ portal/trunk/component/web/src/main/java/conf/portal/ portal/trunk/component/web/src/main/java/org/ portal/trunk/component/web/src/main/java/org/exoplatform/ portal/trunk/component/web/src/main/java/org/exoplatform/download/ portal/trunk/component/web/src/main/java/org/exoplatform/json/ portal/trunk/component/web/src/main/java/org/exoplatform/upload/ portal/trunk/component/web/src/main/java/org/exoplatform/util/ portal/trunk/component/web/src/main/java/org/exoplatform/web/ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/annotation/ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/gadget/ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/mvc/ portal/trunk/component/web/src/main/java/org/exoplatform/web/command/ portal/trunk/component/web/src/main/java/org/exoplatform/web/filter/ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/ portal/trunk/component/web/src/test/ portal/trunk/component/web/src/test/java/ portal/trunk/component/web/src/test/java/conf/ portal/trunk/component/web/src/test/java/conf/portal/ portal/trunk/component/web/src/test/java/org/ portal/trunk/component/web/src/test/java/org/exoplatform/ portal/trunk/component/web/src/test/java/org/exoplatform/download/ portal/trunk/component/web/src/test/java/org/exoplatform/download/test/ portal/trunk/component/web/src/test/java/org/exoplatform/json/ portal/trunk/component/web/src/test/java/org/exoplatform/json/test/ portal/trunk/component/web/src/test/java/org/exoplatform/web/ portal/trunk/component/web/src/test/java/org/exoplatform/web/command/ portal/trunk/component/web/src/test/java/org/exoplatform/web/filter/ portal/trunk/component/web/src/test/resources/ portal/trunk/component/wsrp/ portal/trunk/component/wsrp/src/ portal/trunk/component/wsrp/src/main/ portal/trunk/component/wsrp/src/main/java/ portal/trunk/component/wsrp/src/main/java/conf/ portal/trunk/component/wsrp/src/main/java/org/ portal/trunk/component/wsrp/src/main/java/org/gatein/ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java portal/trunk/component/xml-parser/ portal/trunk/component/xml-parser/src/ portal/trunk/component/xml-parser/src/main/ portal/trunk/component/xml-parser/src/main/java/ portal/trunk/component/xml-parser/src/main/java/conf/ portal/trunk/component/xml-parser/src/main/java/conf/portal/ portal/trunk/component/xml-parser/src/main/java/org/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/chars/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/chars/chardet/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/common/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/common/util/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/parser/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/path/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/refs/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/tidy/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/util/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/rss/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/rss/parser/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/text/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/text/unicode/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/token/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/token/attribute/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/parser/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/serialize/ portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/util/ portal/trunk/component/xml-parser/src/test/ portal/trunk/component/xml-parser/src/test/java/ portal/trunk/component/xml-parser/src/test/java/conf/ portal/trunk/component/xml-parser/src/test/java/conf/portal/ portal/trunk/component/xml-parser/src/test/java/org/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/html/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/html/test/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/rss/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/rss/test/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/test/ portal/trunk/component/xml-parser/src/test/java/org/exoplatform/test/crawler/ portal/trunk/component/xml-parser/src/test/resources/ portal/trunk/docs/ portal/trunk/docs/user-guide/ portal/trunk/docs/user-guide/en/ portal/trunk/docs/user-guide/en/images/ portal/trunk/docs/user-guide/en/modules/ portal/trunk/docs/user-guide/en/modules/_archive/ portal/trunk/docs/user-guide/en/modules/_archive/integration/ portal/trunk/docs/user-guide/en/modules/_orphans/ portal/trunk/docs/user-guide/en/modules/account/ portal/trunk/docs/user-guide/en/modules/configuration/ portal/trunk/docs/user-guide/en/modules/development/ portal/trunk/docs/user-guide/en/modules/gadgets/ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/ portal/trunk/docs/user-guide/en/modules/language/ portal/trunk/docs/user-guide/en/modules/portal/ portal/trunk/docs/user-guide/en/modules/portlets/ portal/trunk/docs/user-guide/en/modules/portletsUser/ portal/trunk/docs/user-guide/en/modules/security/ portal/trunk/docs/user-guide/en/modules/terms/ portal/trunk/gadgets/ portal/trunk/gadgets/core/ portal/trunk/gadgets/core/src/ portal/trunk/gadgets/core/src/main/ portal/trunk/gadgets/core/src/main/java/ portal/trunk/gadgets/core/src/main/java/conf/ portal/trunk/gadgets/core/src/main/java/conf/portal/ portal/trunk/gadgets/core/src/main/java/config/ portal/trunk/gadgets/core/src/main/java/containers/ portal/trunk/gadgets/core/src/main/java/containers/default/ portal/trunk/gadgets/core/src/main/java/org/ portal/trunk/gadgets/core/src/main/java/org/exoplatform/ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ portal/trunk/gadgets/eXoGadgets/ portal/trunk/gadgets/eXoGadgets/src/ portal/trunk/gadgets/eXoGadgets/src/main/ portal/trunk/gadgets/eXoGadgets/src/main/java/ portal/trunk/gadgets/eXoGadgets/src/main/resources/ portal/trunk/gadgets/eXoGadgets/src/main/resources/tomcat/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calendar/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/locale/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/locale/Todo/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/ portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/image/ portal/trunk/gadgets/server/ portal/trunk/gadgets/server/src/ portal/trunk/gadgets/server/src/main/ portal/trunk/gadgets/server/src/main/webapp/ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/config/ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/ portal/trunk/packaging/ portal/trunk/packaging/module/ portal/trunk/packaging/module/src/ portal/trunk/packaging/module/src/main/ portal/trunk/packaging/module/src/main/javascript/ portal/trunk/packaging/pkg/ portal/trunk/packaging/pkg/src/ portal/trunk/packaging/pkg/src/main/ portal/trunk/packaging/pkg/src/main/assembly/ portal/trunk/packaging/product/ portal/trunk/packaging/product/src/ portal/trunk/packaging/product/src/main/ portal/trunk/packaging/product/src/main/javascript/ portal/trunk/packaging/reports/ portal/trunk/patch/ portal/trunk/portlet/ portal/trunk/portlet/dashboard/ portal/trunk/portlet/dashboard/src/ portal/trunk/portlet/dashboard/src/main/ portal/trunk/portlet/dashboard/src/main/java/ portal/trunk/portlet/dashboard/src/main/java/org/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/ portal/trunk/portlet/dashboard/src/main/resources/ portal/trunk/portlet/dashboard/src/main/resources/tomcat/ portal/trunk/portlet/dashboard/src/main/webapp/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/ portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/ portal/trunk/portlet/dashboard/src/main/webapp/skin/ portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/ portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/webui/ portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/webui/component/ portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/webui/component/UIGadgetPortlet/ portal/trunk/portlet/exoadmin/ portal/trunk/portlet/exoadmin/src/ portal/trunk/portlet/exoadmin/src/main/ portal/trunk/portlet/exoadmin/src/main/java/ portal/trunk/portlet/exoadmin/src/main/java/org/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/model/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n/webui/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n/webui/component/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/ portal/trunk/portlet/exoadmin/src/main/resources/ portal/trunk/portlet/exoadmin/src/main/resources/tomcat/ portal/trunk/portlet/exoadmin/src/main/webapp/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/help/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/I18nPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/I18nPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/webui/component/model/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/component/ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml portal/trunk/portlet/exoadmin/src/main/webapp/groovy/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/organization/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/organization/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/resources/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/resources/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/resources/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/DefaultSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/DefaultSkin/portletIcons/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/DefaultSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/DefaultSkin/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/DefaultSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/DefaultSkin/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/MacSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/MacSkin/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/VistaSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/VistaSkin/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/DefaultSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/DefaultSkin/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/DefaultSkin/icons/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultSkin/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/webui/component/UII18nPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultSkin/ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultSkin/background/ portal/trunk/portlet/web/ portal/trunk/portlet/web/src/ portal/trunk/portlet/web/src/main/ portal/trunk/portlet/web/src/main/java/ portal/trunk/portlet/web/src/main/java/org/ portal/trunk/portlet/web/src/main/java/org/exoplatform/ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java portal/trunk/portlet/web/src/main/resources/ portal/trunk/portlet/web/src/main/resources/tomcat/ portal/trunk/portlet/web/src/main/webapp/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/portal/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/webui/ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/webui/component/ portal/trunk/portlet/web/src/main/webapp/groovy/ portal/trunk/portlet/web/src/main/webapp/groovy/groovy/ portal/trunk/portlet/web/src/main/webapp/groovy/groovy/webui/ portal/trunk/portlet/web/src/main/webapp/groovy/groovy/webui/component/ portal/trunk/portlet/web/src/main/webapp/groovy/portal/ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/ portal/trunk/portlet/web/src/main/webapp/skin/ portal/trunk/portlet/web/src/main/webapp/skin/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/DefaultSkin/portletIcons/ portal/trunk/portlet/web/src/main/webapp/skin/portal/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultSkin/background/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/background/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/icons/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/icons/16x16/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/icons/24x24/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIFooterPortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIFooterPortlet/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIFooterPortlet/DefaultSkin/background/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultSkin/background/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/ portal/trunk/portlet/web/src/test/ Log: GTNPORTAL-176 Merge WSRP integration branch ( up to revision 463 ) into trunk Property changes on: portal/trunk/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/application-registry/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/jcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/org/exoplatform/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/registry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/common/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/commons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/services/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/services/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/services/resources/impl ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/java/org/exoplatform/services/resources/impl/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org/exoplatform/commons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org/exoplatform/commons/utils ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org/exoplatform/services/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/java/org/exoplatform/services/resources/impl ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/resources/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/resources/locale/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/common/src/test/resources/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/dashboard/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java =================================================================== --- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -108,7 +108,9 @@ { UIDashboard uiDashboard = (UIDashboard)event.getSource(); if (!uiDashboard.canEdit()) + { return; + } PortletRequestContext pcontext = (PortletRequestContext)event.getRequestContext(); boolean isShow = Boolean.parseBoolean(pcontext.getRequestParameter("isShow")); uiDashboard.setShowSelectPopup(isShow); Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java =================================================================== --- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -52,42 +52,32 @@ public class UIDashboardContainer extends org.exoplatform.webui.core.UIContainer { - /** - * Specify max number of columns in dashboard container - * Default value is 4 - */ + /** Specify max number of columns in dashboard container Default value is 4 */ public static final int MAX_COLUMN = 4; - /** - * Column Type of Container - */ + /** Column Type of Container */ public static final String COLUMN_CONTAINER = "column"; - /** - * Row Type of Container - */ + /** Row Type of Container */ public static final String ROW_CONTAINER = "row"; - /** - * Root Type of Container - */ + /** Root Type of Container */ public static final String ROOT_CONTAINER = "dashboard"; /** - * + * */ private List<SelectItemOption<String>> containerOptions; /** - * Specify windowId of <code>UIPortlet</code> that contains <code>UIDashboardPortlet</code> which this belong to + * Specify windowId of <code>UIPortlet</code> that contains <code>UIDashboardPortlet</code> which this belong to + * * @see UIPortlet * @see org.exoplatform.dashboard.webui.component.DashboardParent */ private String windowId; - /** - * Preconfig template - */ + /** Preconfig template */ private String containerTemplate = null; public static final String COLINDEX = "colIndex"; @@ -96,6 +86,7 @@ /** * Constructs new UIDashboardContainer which belongs to a UIDashboardPortlet + * * @param initParams initial parameters * @throws Exception if can't create UIDashboardContainer * @see org.exoplatform.dashboard.webui.component.DashboardParent @@ -135,7 +126,9 @@ dashboard = service.loadDashboard(currentUIPortlet.getStorageId()); } else + { dashboard = createContainer(COLUMN_CONTAINER, null); + } // UIContainer uiRoot = getChild(UIContainer.class); @@ -152,9 +145,10 @@ /** * Adds an UIGadget into UIDashboardContainer in specified position - * @param gadget UIGadget to add in UIDashboardContainer - * @param col index of column to add - * @param row index of row to add + * + * @param gadget UIGadget to add in UIDashboardContainer + * @param col index of column to add + * @param row index of row to add * @return <code>UIGadget</code> object which added in * @see UIGadget */ @@ -172,10 +166,10 @@ /** * Gets an UIGadget at specified position + * * @param col index of column * @param row index of row - * @return <code>null</code> if specified position doesn't exist - * <code>UIGadget</code> otherwise + * @return <code>null</code> if specified position doesn't exist <code>UIGadget</code> otherwise * @see UIGadget */ public UIGadget getUIGadget(final int col, final int row) @@ -190,9 +184,9 @@ /** * Gets an UIGadget which has applicationInstanceUniqueId_ according to specified Id - * @param gadgetId applicationInstanceUniqueId_ of UIGadget - * @return <code>null</code> if UIGadget doesn't exist<br> - * <code>UIGadget<code> otherwise + * + * @param gadgetId applicationInstanceUniqueId_ of UIGadget + * @return <code>null</code> if UIGadget doesn't exist<br> <code>UIGadget<code> otherwise * @see UIGadget */ public UIGadget getUIGadget(final String gadgetId) @@ -213,10 +207,10 @@ } /** - * Removes an UIGadget belongs to this which has specified applicationInstanceUniqueId_ + * Removes an UIGadget belongs to this which has specified applicationInstanceUniqueId_ + * * @param gadgetId applicationInstanceUniqueId_ of UIGadget - * @return <code>UIGadget</code> which deleted<br> - * <code>null</code> otherwise + * @return <code>UIGadget</code> which deleted<br> <code>null</code> otherwise * @see UIGadget */ public UIGadget removeUIGadget(final String gadgetId) @@ -233,10 +227,10 @@ /** * Removes an UIGadget at specified position + * * @param col index of the column * @param row index of the row - * @return <code>UIGadget</code> which deleted<br> - * <code>null</code> otherwise + * @return <code>UIGadget</code> which deleted<br> <code>null</code> otherwise * @see UIGadget */ public UIGadget removeUIGadget(final int col, final int row) @@ -251,9 +245,10 @@ /** * Moves an UIGadget which has specified applicationInstanceUniqueId_ to specified position + * * @param gadgetId applicationInstanceUniqueId_ of UIGadget - * @param col index of destination column - * @param row index of destination row + * @param col index of destination column + * @param row index of destination row * @see UIGadget */ public void moveUIGadget(final String gadgetId, final int col, final int row) @@ -267,10 +262,10 @@ } /** - * Gets an UIContainer representation of a column at specified index + * Gets an UIContainer representation of a column at specified index + * * @param col index of column - * @return <code>UIContainer</code> if the column exist<br> - * <code>null</code> otherwise + * @return <code>UIContainer</code> if the column exist<br> <code>null</code> otherwise * @see UIContainer */ public UIContainer getColumn(final int col) @@ -284,8 +279,9 @@ /** * Tests if this UIDashboardContainer has UIGadget - * @return <code>false</code> if and only if this UIDashboardContainer has no UIGadget<br> - * <code>true</code> otherwise + * + * @return <code>false</code> if and only if this UIDashboardContainer has no UIGadget<br> <code>true</code> + * otherwise */ public boolean hasUIGadget() { @@ -295,9 +291,10 @@ /** * Sets total of columns of this UIDashboardContainer, total of columns is between 1 and <tt>MAX_COLUMN</tt> + * * @param num total of columns - * @return <code>null</code> if totals of columns is less than 1 or greater than <tt>MAX_COLUMN</tt> - * this <code>UIDashboardContainer</code> otherwise + * @return <code>null</code> if totals of columns is less than 1 or greater than <tt>MAX_COLUMN</tt> this + * <code>UIDashboardContainer</code> otherwise * @throws Exception if this UIDashboardContainer can not create new UIComponent */ public UIDashboardContainer setColumns(final int num) throws Exception @@ -348,6 +345,7 @@ /** * Returns a <tt>List</tt> of the UIContainers of this UIDashboardContainer which representation of list of columns. + * * @return <code>List</code> of UIContainer * @see List * @see UIContainer @@ -366,10 +364,10 @@ /** * Creates a Container that representation of row or column in this UIDashboardContainer + * * @param type type of Container, that is <tt>ROW_CONTAINER</tt> or <tt>COLUMN_CONTAINER</tt> - * @param id id of Container - * @return <code>Container</code> if {@link UIDashboardContainer} has specified type - * <br><code>null</code> otherwise + * @param id id of Container + * @return <code>Container</code> if {@link UIDashboardContainer} has specified type <br><code>null</code> otherwise * @throws Exception if <code>toContainer(String)</code> method throws an Exception * @see Container * @see UIDashboardContainer#toContainer(String) @@ -382,7 +380,9 @@ { Container container = toContainer(item.getValue()); if (id != null) + { container.setId(id); + } return container; } } @@ -390,10 +390,11 @@ } /** - * Creates a Container from a xml template + * Creates a Container from a xml template + * * @param xml template of Container - * @return <code>null</code> if template is not suitable for {@link Container}<br /> - * <code>Container</code> otherwise + * @return <code>null</code> if template is not suitable for {@link Container}<br /> <code>Container</code> + * otherwise * @throws Exception if have problems in unmarshal process * @see IUnmarshallingContext#unmarshalDocument(java.io.InputStream, String) */ @@ -407,6 +408,7 @@ /** * Get windowId of <code>UIPortlet</code> + * * @return a String represents windowId of portlet * @see UIPortlet */ @@ -416,7 +418,7 @@ } /** - * + * */ public void setContainerTemplate(String template) { @@ -424,7 +426,7 @@ } /** - * + * */ public String getContainerTemplate() { @@ -432,7 +434,8 @@ } /** - * Saves all <tt>UIComponent</tt> of this <tt>UIDashboardContainer</tt> to database + * Saves all <tt>UIComponent</tt> of this <tt>UIDashboardContainer</tt> to database + * * @throws Exception */ public void save() throws Exception @@ -440,7 +443,9 @@ UIContainer uiRoot = findFirstComponentOfType(UIContainer.class); if (!((UIDashboard)getParent()).canEdit()) + { return; + } // DataStorage service = getApplicationComponent(DataStorage.class); @@ -466,7 +471,9 @@ WebuiRequestContext context = event.getRequestContext(); UIDashboard uiDashboard = event.getSource(); if (!uiDashboard.canEdit()) + { return; + } int col = Integer.parseInt(context.getRequestParameter(COLINDEX)); int row = Integer.parseInt(context.getRequestParameter(ROWINDEX)); String objectId = context.getRequestParameter(UIComponent.OBJECTID); @@ -494,7 +501,9 @@ WebuiRequestContext context = event.getRequestContext(); UIDashboard uiDashboard = event.getSource(); if (!uiDashboard.canEdit()) + { return; + } UIDashboardContainer uiDashboardContainer = uiDashboard.getChild(UIDashboardContainer.class); int col = Integer.parseInt(context.getRequestParameter(COLINDEX)); int row = Integer.parseInt(context.getRequestParameter(ROWINDEX)); @@ -513,7 +522,9 @@ { UIDashboard uiDashboard = event.getSource(); if (!uiDashboard.canEdit()) + { return; + } WebuiRequestContext context = event.getRequestContext(); String objectId = context.getRequestParameter(OBJECTID); @@ -527,7 +538,9 @@ } uiDashboardContainer.save(); if (!isMaximized) + { context.setResponseComplete(true); + } } } Property changes on: portal/trunk/component/dashboard/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/conf/uiconf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/conf/uiconf/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/conf/uiconf/dashboard/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/conf/uiconf/dashboard/webui/container ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/groovy/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/identity/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/jbidm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/component/pc/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -54,14 +54,12 @@ protected PortletApplicationDeployer portletApplicationRegistry; - /** - * Exo Context - */ + /** Exo Context */ private final ExoContainer container; /** - * We enforce the dependency with the ResourceBundleService since it must be stared before - * the <code>portletApplicationRegistry</code> + * We enforce the dependency with the ResourceBundleService since it must be stared before the + * <code>portletApplicationRegistry</code> */ public ExoKernelIntegration(ExoContainerContext context, ResourceBundleService resourceBundleService) { @@ -102,6 +100,9 @@ // The portlet container invoker continued containerPortletInvoker.setNext(valveInterceptor); + // register container invoker so that WSRP can use it, WSRP uses its own ProducerPortletInvoker + container.registerComponentInstance(ContainerPortletInvoker.class, containerPortletInvoker); + // The producer persistence manager PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService(); @@ -119,9 +120,6 @@ producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); producerPortletInvoker.setStateConverter(producerStateConverter); - // register producer portlet invoker so that WSRP can use it - container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker); - // The consumer portlet invoker PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor(); portletCustomizationInterceptor.setNext(producerPortletInvoker); Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/bundle ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/impl ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/java/org/exoplatform/services/portletcontainer/impl/servlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/pc/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/component/portal/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Copied: portal/trunk/component/portal/src/main/java/conf/portal/content-nodetypes.xml (from rev 463, portal/branches/wsrp-integration/component/portal/src/main/java/conf/portal/content-nodetypes.xml) =================================================================== --- portal/trunk/component/portal/src/main/java/conf/portal/content-nodetypes.xml (rev 0) +++ portal/trunk/component/portal/src/main/java/conf/portal/content-nodetypes.xml 2009-11-09 11:39:22 UTC (rev 528) @@ -0,0 +1,45 @@ + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="mop:wsrpState" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>mop:customizationstate</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="portletId" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="cloned" requiredType="Boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> Modified: portal/trunk/component/portal/src/main/java/conf/portal/model-nodetypes.xml =================================================================== --- portal/trunk/component/portal/src/main/java/conf/portal/model-nodetypes.xml 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/conf/portal/model-nodetypes.xml 2009-11-09 11:39:22 UTC (rev 528) @@ -20,17 +20,17 @@ --> <nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" - xmlns:jcr="http://www.jcp.org/jcr/1.0"> + xmlns:jcr="http://www.jcp.org/jcr/1.0"> - <nodeType name="exo:gadget" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:unstructured</supertype> - </supertypes> - <propertyDefinitions> -  - </propertyDefinitions> - </nodeType> - + <nodeType name="exo:gadget" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:unstructured</supertype> + </supertypes> + <propertyDefinitions> +  + </propertyDefinitions> + </nodeType> + </nodeTypes> \ No newline at end of file Property changes on: portal/trunk/component/portal/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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,9 +37,7 @@ import java.util.Iterator; import java.util.List; -/** - * Jun 27, 2006 - */ +/** Jun 27, 2006 */ public class UserACL { public final static String EVERYONE = "Everyone"; @@ -76,21 +74,33 @@ UserACLMetaData md = new UserACLMetaData(); ValueParam superUserParam = params.getValueParam("super.user"); if (superUserParam != null) + { md.setSuperUser(superUserParam.getValue()); + } ValueParam guestGroupParam = params.getValueParam("guests.group"); if (guestGroupParam != null) + { md.setGuestsGroups(guestGroupParam.getValue()); + } ValueParam navCretorParam = params.getValueParam("navigation.creator.membership.type"); if (navCretorParam != null) + { md.setNavigationCreatorMembershipType(navCretorParam.getValue()); + } ValueParam portalCretorGroupsParam = params.getValueParam("portal.creator.groups"); if (portalCretorGroupsParam != null) + { md.setPortalCreateGroups(portalCretorGroupsParam.getValue()); + } ValuesParam mandatoryGroupsParam = params.getValuesParam("mandatory.groups"); if (mandatoryGroupsParam != null) + { mandatoryGroups_ = mandatoryGroupsParam.getValues(); + } else + { mandatoryGroups_ = new ArrayList<String>(); + } ValuesParam mandatoryMSTypesParam = params.getValuesParam("mandatory.mstypes"); if (mandatoryMSTypesParam != null) @@ -101,12 +111,16 @@ // tam.nguyen get admin group value ValueParam adminGroupsParam = params.getValueParam("portal.administrator.groups"); if (adminGroupsParam != null) + { setAdminGroups(adminGroupsParam.getValue()); + } // tam.nguyen get administrator member type ValueParam adminMSTypeParam = params.getValueParam("portal.administrator.mstype"); if (adminMSTypeParam != null) + { setAdminMSType(adminMSTypeParam.getValue()); + } init(md); } @@ -123,23 +137,37 @@ private void init(UserACLMetaData md) { if (md.getSuperUser() != null) + { superUser_ = md.getSuperUser(); + } if (superUser_ == null || superUser_.trim().length() == 0) + { superUser_ = "root"; + } if (md.getGuestsGroups() != null) + { guestGroup_ = md.getGuestsGroups(); + } if (guestGroup_ == null || guestGroup_.trim().length() < 1) + { guestGroup_ = "/platform/guests"; + } if (md.getNavigationCreatorMembershipType() != null) + { navigationCreatorMembershipType_ = md.getNavigationCreatorMembershipType(); + } if (navigationCreatorMembershipType_ == null || navigationCreatorMembershipType_.trim().length() == 0) + { navigationCreatorMembershipType_ = "owner"; + } String allGroups = ""; if (md.getPortalCreateGroups() != null) + { allGroups = md.getPortalCreateGroups(); + } portalCreatorGroups_ = defragmentPermission(allGroups); } @@ -216,7 +244,9 @@ ConversationState conv = ConversationState.getCurrent(); Identity id = null; if (conv != null) + { id = conv.getIdentity(); + } if (id == null) { @@ -270,7 +300,9 @@ ConversationState conv = ConversationState.getCurrent(); Identity id = null; if (conv != null) + { id = conv.getIdentity(); + } if (id == null) { @@ -282,7 +314,9 @@ while (iter.hasNext()) { if (iter.next().equals(group)) + { return true; + } } return false; @@ -304,7 +338,9 @@ for (String per : accessPerms) { if (hasPermission(identity, per)) + { return true; + } } return false; } @@ -312,20 +348,28 @@ private boolean hasEditPermission(Identity identity, PortalConfig pconfig) { if (superUser_.equals(identity.getUserId())) + { return true; + } return hasPermission(identity, pconfig.getEditPermission()); } private boolean hasCreatePortalPermission(Identity identity) { if (superUser_.equals(identity.getUserId())) + { return true; + } if (portalCreatorGroups_ == null || portalCreatorGroups_.size() < 1) + { return false; + } for (String ele : portalCreatorGroups_) { if (hasPermission(identity, ele)) + { return true; + } } return false; } @@ -351,7 +395,9 @@ expAdminGroup = expAdminGroup.startsWith("/") ? expAdminGroup : "/" + expAdminGroup; expPerm = temp.startsWith("/") ? temp : "/" + temp; if (isUserInGroup(expPerm) && isUserInGroup(expAdminGroup)) + { return true; + } } expPerm = navigationCreatorMembershipType_ + (temp.startsWith("/") ? ":" + temp : ":/" + temp); @@ -386,12 +432,15 @@ } page.setModifiable(false); String[] accessPerms = page.getAccessPermissions(); - if (accessPerms != null) { - for (String per : accessPerms) - { - if (hasPermission(identity, per)) - return true; - } + if (accessPerms != null) + { + for (String per : accessPerms) + { + if (hasPermission(identity, per)) + { + return true; + } + } } return false; } @@ -437,16 +486,24 @@ { String currentUser = identity.getUserId(); if (superUser_.equals(currentUser)) + { return true; + } if (expPerm == null) + { return false; + } if (EVERYONE.equals(expPerm)) + { return true; + } Permission permission = new Permission(); permission.setPermissionExpression(expPerm); String groupId = permission.getGroupId(); if (currentUser == null && groupId.equals(guestGroup_)) + { return true; + } if (identity == null) { return false; @@ -492,10 +549,14 @@ public void setPermissionExpression(String exp) { if (exp == null || exp.length() == 0) + { return; + } String[] temp = exp.split(":"); if (temp.length < 2) + { return; + } expression = exp; membership_ = temp[0].trim(); groupId_ = temp[1].trim(); @@ -524,7 +585,9 @@ public String getValue() { if (membership_.length() == 0 || groupId_.length() == 0) + { return null; + } return membership_ + ":" + groupId_; } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2009-11-09 11:39:22 UTC (rev 528) @@ -393,7 +393,6 @@ public void create(PageNavigation navigation) throws Exception { storage_.create(navigation); - navigation.setSerialMark(System.currentTimeMillis()); listenerService.broadcast(CREATE_NAVIGATION_EVENT, this, navigation); } @@ -432,10 +431,6 @@ public PageNavigation getPageNavigation(String ownerType, String id) throws Exception { PageNavigation navigation = storage_.getPageNavigation(ownerType, id); - if (navigation != null) - { - navigation.setSerialMark(System.currentTimeMillis()); - } return navigation; } Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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,7 +24,7 @@ import org.exoplatform.portal.config.model.wsrp.WSRPId; import org.exoplatform.portal.pom.spi.gadget.Gadget; 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.gatein.mop.api.content.ContentType; /** @@ -47,8 +47,7 @@ new ApplicationType<Gadget, GadgetId>(Gadget.CONTENT_TYPE, "gadget"); /** . */ - public static final ApplicationType<WSRPState, WSRPId> WSRP_PORTLET = - new ApplicationType<WSRPState, WSRPId>(WSRPState.CONTENT_TYPE, "wsrp"); + public static final ApplicationType<WSRP, WSRPId> WSRP_PORTLET = new ApplicationType<WSRP, WSRPId>(WSRP.CONTENT_TYPE, "wsrp"); /** . */ private final ContentType<S> contentType; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java 2009-11-09 11:39:22 UTC (rev 528) @@ -32,7 +32,7 @@ import org.exoplatform.portal.pom.data.PageData; import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.portlet.Preferences; -import org.exoplatform.portal.pom.spi.wsrp.WSRPState; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -116,7 +116,7 @@ } else if (ApplicationType.WSRP_PORTLET == type) { - return new WSRPApplication((ApplicationData<WSRPState, WSRPId>)applicationData); + return new WSRPApplication((ApplicationData<WSRP, WSRPId>)applicationData); } else { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2009-11-09 11:39:22 UTC (rev 528) @@ -47,8 +47,6 @@ private int priority = 1; - private long serialMark; - PageNavigation(String storageId) { super(storageId); @@ -190,16 +188,6 @@ return null; } - public long getSerialMark() - { - return serialMark; - } - - public void setSerialMark(long serialModifiedKey) - { - this.serialMark = serialModifiedKey; - } - public PageNavigation clone() { PageNavigation newNav = new PageNavigation(); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -42,8 +42,7 @@ public TransientApplicationState(String uniqueId) { - this.contentState = null; - this.uniqueId = uniqueId; + this(null, uniqueId); } public TransientApplicationState(S contentState, String uniqueId) @@ -54,8 +53,7 @@ public TransientApplicationState(S contentState) { - this.contentState = contentState; - this.uniqueId = null; + this(contentState, null); } public TransientApplicationState() Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp/WSRPApplication.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp/WSRPApplication.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp/WSRPApplication.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -20,20 +20,19 @@ package org.exoplatform.portal.config.model.wsrp; import org.exoplatform.portal.config.model.Application; -import org.exoplatform.portal.pom.data.ApplicationData; import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.portal.pom.spi.wsrp.WSRPState; +import org.exoplatform.portal.pom.data.ApplicationData; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class WSRPApplication extends Application<WSRPState, WSRPId> +public class WSRPApplication extends Application<WSRP, WSRPId> { - - public WSRPApplication(ApplicationData<WSRPState, WSRPId> data) + public WSRPApplication(ApplicationData<WSRP, WSRPId> wsrpwsrpIdApplicationData) { - super(data); + super(wsrpwsrpIdApplicationData); } public WSRPApplication(String storageId, WSRPId id) @@ -47,7 +46,7 @@ } @Override - public ApplicationType<WSRPState, WSRPId> getType() + public ApplicationType<WSRP, WSRPId> getType() { return ApplicationType.WSRP_PORTLET; } Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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.pom.spi.portlet.PortletPreferenceState; import org.exoplatform.portal.pom.spi.portlet.PortletPreferencesState; import org.exoplatform.portal.pom.spi.portlet.Preferences; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.pom.spi.wsrp.WSRPContentProvider; import org.exoplatform.portal.pom.spi.wsrp.WSRPState; import org.exoplatform.services.jcr.RepositoryService; @@ -59,14 +60,13 @@ import org.gatein.mop.core.api.workspace.content.WorkspaceClone; import org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization; -import java.lang.reflect.Field; -import java.lang.reflect.UndeclaredThrowableException; -import java.util.Set; - import javax.jcr.Credentials; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; +import java.lang.reflect.Field; +import java.lang.reflect.UndeclaredThrowableException; +import java.util.Set; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -186,16 +186,15 @@ builder.add(PortletPreferencesState.class); builder.add(PortletPreferenceState.class); builder.add(GadgetState.class); + builder.add(WSRPState.class); - // - CustomizationContextProviderRegistry customizationContextResolvers = - new CustomizationContextProviderRegistry(); + CustomizationContextProviderRegistry customizationContextResolvers = new CustomizationContextProviderRegistry(); // ContentManagerRegistry contentManagerRegistry = new ContentManagerRegistry(); contentManagerRegistry.register(Preferences.CONTENT_TYPE, new PortletContentProvider()); contentManagerRegistry.register(Gadget.CONTENT_TYPE, new GadgetContentProvider()); - contentManagerRegistry.register(WSRPState.CONTENT_TYPE, new WSRPContentProvider()); + contentManagerRegistry.register(WSRP.CONTENT_TYPE, new WSRPContentProvider()); // chromeField.set(pomService, builder.build()); @@ -224,8 +223,8 @@ } /** - * <p>Open and returns a session to the model. When the current thread is already associated with a previously - * opened session the method will throw an <tt>IllegalStateException</tt>.</p> + * <p>Open and returns a session to the model. When the current thread is already associated with a previously opened + * session the method will throw an <tt>IllegalStateException</tt>.</p> * * @return a session to the model. */ @@ -256,8 +255,8 @@ } /** - * <p>Closes the current session and optionally saves its content. If no session is associated - * then this method has no effects and returns false.</p> + * <p>Closes the current session and optionally saves its content. If no session is associated then this method has + * no effects and returns false.</p> * * @param save if the session must be saved * @return a boolean indicating if the session was closed @@ -287,4 +286,32 @@ return true; } } + + /** + * <p>Execute the task with a session. The method attempts first to get a current session and if no such session is + * found then a session will be created for the scope of the method.</p> + * + * @param task the task to execute + * @throws Exception any exception thrown by the task + */ + public void execute(POMTask task) throws Exception + { + POMSession session = getSession(); + if (session == null) + { + session = openSession(); + try + { + session.execute(task); + } + finally + { + closeSession(true); + } + } + else + { + session.execute(task); + } + } } Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2009-11-09 11:39:22 UTC (rev 528) @@ -22,31 +22,18 @@ import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.model.ApplicationState; import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.portal.pom.data.BodyType; import org.exoplatform.portal.config.model.ModelChange; import org.exoplatform.portal.config.model.PersistentApplicationState; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.TransientApplicationState; import org.exoplatform.portal.config.model.gadget.GadgetId; -import org.exoplatform.portal.pom.config.Utils; -import static org.exoplatform.portal.pom.config.Utils.join; -import static org.exoplatform.portal.pom.config.Utils.split; - import org.exoplatform.portal.config.model.portlet.PortletId; import org.exoplatform.portal.config.model.wsrp.WSRPId; import org.exoplatform.portal.pom.config.POMSession; -import org.exoplatform.portal.pom.data.ApplicationData; -import org.exoplatform.portal.pom.data.BodyData; -import org.exoplatform.portal.pom.data.ComponentData; -import org.exoplatform.portal.pom.data.ContainerData; -import org.exoplatform.portal.pom.data.DashboardData; -import org.exoplatform.portal.pom.data.ModelData; -import org.exoplatform.portal.pom.data.NavigationNodeContainerData; -import org.exoplatform.portal.pom.data.PageData; -import org.exoplatform.portal.pom.data.PortalData; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.portal.pom.spi.gadget.Gadget; 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.gatein.mop.api.Attributes; import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.content.Customization; @@ -75,6 +62,9 @@ import java.util.Set; import java.util.UUID; +import static org.exoplatform.portal.pom.config.Utils.join; +import static org.exoplatform.portal.pom.config.Utils.split; + /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -558,22 +548,25 @@ } private void build(ContainerData parent, Map<String, String> hierarchyRelationships) - { + { String parentId = parent.getStorageId(); - for (ModelData child : parent.getChildren()) + if (parentId != null) { - String childId = child.getStorageId(); - if (childId != null) + for (ModelData child : parent.getChildren()) { - if (hierarchyRelationships.put(childId, parentId) != null) + String childId = child.getStorageId(); + if (childId != null) { - throw new AssertionError("The same object is present two times in the object hierarchy"); - } + if (hierarchyRelationships.put(childId, parentId) != null) + { + throw new AssertionError("The same object is present two times in the object hierarchy"); + } + if (child instanceof ContainerData) + { + build((ContainerData)child, hierarchyRelationships); + } + } } - if (child instanceof ContainerData) - { - build((ContainerData)child, hierarchyRelationships); - } } } @@ -754,6 +747,9 @@ // String contentId = customization.getContentId(); + + + // I ref; ApplicationType<S, I> type; @@ -770,7 +766,7 @@ ref = (I)new GadgetId(contentId); type = (ApplicationType<S,I>)ApplicationType.GADGET; } - else if (contentType == WSRPState.CONTENT_TYPE) + else if (contentType == WSRP.CONTENT_TYPE) { ref = (I)new WSRPId(contentId); type = (ApplicationType<S,I>)ApplicationType.WSRP_PORTLET; @@ -866,7 +862,7 @@ GadgetId id = (GadgetId)src.getRef(); contentId = id.getGadgetName(); } - else if (contentType == WSRPState.CONTENT_TYPE) + else if (contentType == WSRP.CONTENT_TYPE) { WSRPId id = (WSRPId)src.getRef(); contentId = id.getUri(); Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -27,7 +27,7 @@ { String getNodeName(); - void setInternalState(InternalState internalState, State state); + void setInternalState(InternalState persistedState, State updatedState); State getState(InternalState internalState); } Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -61,7 +61,7 @@ public String getNodeName() { - return "mop:gadget"; + return GadgetState.MOP_NODE_NAME; } public void setInternalState(GadgetState gadgetState, Gadget gadget) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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,9 +26,10 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "mop:gadget") +@NodeMapping(name = GadgetState.MOP_NODE_NAME) public abstract class GadgetState { + static final String MOP_NODE_NAME = "mop:gadget"; @Property(name = "prefs") public abstract String getUserPrefs(); Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -84,7 +84,7 @@ public String getNodeName() { - return "mop:portletpreferences"; + return PortletPreferencesState.MOP_NODE_NAME; } public void setInternalState(PortletPreferencesState portletPreferencesState, Preferences preferences) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletPreferencesState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletPreferencesState.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletPreferencesState.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -32,12 +32,13 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "mop:portletpreferences") +@NodeMapping(name = PortletPreferencesState.MOP_NODE_NAME) public abstract class PortletPreferencesState { /** . */ private Preferences payload; + static final String MOP_NODE_NAME = "mop:portletpreferences"; @OneToMany public abstract Map<String, PortletPreferenceState> getChildren(); Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Copied: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRP.java (from rev 463, portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRP.java) =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRP.java (rev 0) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRP.java 2009-11-09 11:39:22 UTC (rev 528) @@ -0,0 +1,107 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.exoplatform.portal.pom.spi.wsrp; + +import org.gatein.mop.api.content.ContentType; + +import java.io.Serializable; +import java.util.Arrays; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class WSRP implements Serializable +{ + public static final ContentType<WSRP> CONTENT_TYPE = new ContentType<WSRP>("application/wsrp", WSRP.class); + + private byte[] state; + private String portletId; + private boolean isCloned; + + public byte[] getState() + { + return state; + } + + public void setState(byte[] state) + { + this.state = state; + } + + public String getPortletId() + { + return portletId; + } + + public void setPortletId(String portletId) + { + this.portletId = portletId; + } + + public boolean isCloned() + { + return isCloned; + } + + public void setCloned(boolean cloned) + { + isCloned = cloned; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (!(o instanceof WSRP)) + { + return false; + } + + WSRP wsrp = (WSRP)o; + + if (portletId != null ? !portletId.equals(wsrp.portletId) : wsrp.portletId != null) + { + return false; + } + return Arrays.equals(state, wsrp.state); + + } + + @Override + public int hashCode() + { + int result = state != null ? Arrays.hashCode(state) : 0; + result = 31 * result + (portletId != null ? portletId.hashCode() : 0); + return result; + } + + @Override + public String toString() + { + return "WSRP[portletId='" + portletId + "', state=" + state + ']'; + } +} Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -21,57 +21,93 @@ import org.exoplatform.portal.pom.spi.ContentProviderHelper; import org.exoplatform.portal.pom.spi.HelpableContentProvider; +import org.gatein.common.io.IOTools; import org.gatein.mop.spi.content.ContentProvider; import org.gatein.mop.spi.content.GetState; import org.gatein.mop.spi.content.StateContainer; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.List; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class WSRPContentProvider implements ContentProvider<WSRPState>, HelpableContentProvider<byte[], WSRPState> +public class WSRPContentProvider implements ContentProvider<WSRP>, HelpableContentProvider<WSRPState, WSRP> { - public GetState<WSRPState> getState(String s) + + public GetState<WSRP> getState(String s) { throw new UnsupportedOperationException("todo"); } - public WSRPState combine(List<WSRPState> wsrpStates) + public WSRP combine(List<WSRP> wsrpStates) { throw new UnsupportedOperationException("todo"); } - public void setState(StateContainer stateContainer, WSRPState wsrpState) + public void setState(StateContainer stateContainer, WSRP wsrpState) { ContentProviderHelper.setState(stateContainer, wsrpState, this); } - public WSRPState getState(StateContainer stateContainer) + public WSRP getState(StateContainer stateContainer) { return ContentProviderHelper.getState(stateContainer, this); } - public Class<WSRPState> getStateType() + public Class<WSRP> getStateType() { - return WSRPState.class; + return WSRP.class; } public String getNodeName() { - return "mop:wsrpState"; + return WSRPState.MOP_NODE_NAME; } - public void setInternalState(byte[] bytes, WSRPState wsrpState) + public void setInternalState(WSRPState persistedState, WSRP updatedState) { - wsrpState.setState(bytes); + byte[] bytes = updatedState.getState(); + if (bytes != null && bytes.length > 0) + { + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + persistedState.setState(is); + } + persistedState.setPortletId(updatedState.getPortletId()); + persistedState.setCloned(updatedState.isCloned()); } - public WSRPState getState(byte[] bytes) + private byte[] getBytes(InputStream is) { - WSRPState wsrpState = new WSRPState(); - wsrpState.setState(bytes); - return wsrpState; + byte[] bytes; + + if (is == null) + { + return null; + } + + try + { + bytes = IOTools.getBytes(is); + } + catch (IOException e) + { + throw new RuntimeException("Couldn't get bytes from WSRPState", e); // todo: log instead? + } + IOTools.safeClose(is); + return bytes; } + + public WSRP getState(WSRPState state) + { + WSRP wsrp = new WSRP(); + byte[] bytes = getBytes(state.getState()); + wsrp.setState(bytes); + wsrp.setPortletId(state.getPortletId()); + wsrp.setCloned(state.getCloned()); + return wsrp; + } } Copied: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPPortletStateType.java (from rev 463, portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPPortletStateType.java) =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPPortletStateType.java (rev 0) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPPortletStateType.java 2009-11-09 11:39:22 UTC (rev 528) @@ -0,0 +1,58 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.exoplatform.portal.pom.spi.wsrp; + +import org.gatein.pc.api.PortletStateType; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class WSRPPortletStateType extends PortletStateType<WSRP> +{ + public static final WSRPPortletStateType instance = new WSRPPortletStateType(); + + @Override + public Class<WSRP> getJavaType() + { + return WSRP.class; + } + + @Override + public boolean equals(WSRP state1, WSRP state2) + { + return state1.equals(state2); + } + + @Override + public int hashCode(WSRP state) + { + return state.hashCode(); + } + + @Override + public String toString(WSRP state) + { + return state.toString(); + } +} Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2009-11-09 11:39:22 UTC (rev 528) @@ -1,46 +1,53 @@ -/** - * 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 - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ package org.exoplatform.portal.pom.spi.wsrp; -import org.gatein.mop.api.content.ContentType; +import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.Property; -import java.io.Serializable; +import java.io.InputStream; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class WSRPState implements Serializable +@NodeMapping(name = WSRPState.MOP_NODE_NAME) +public abstract class WSRPState { - public static final ContentType<WSRPState> CONTENT_TYPE = - new ContentType<WSRPState>("application/wsrp", WSRPState.class); + static final String MOP_NODE_NAME = "mop:wsrpState"; - private byte[] state; + @Property(name = "portletId") + public abstract String getPortletId(); - public byte[] getState() - { - return state; - } + public abstract void setPortletId(String portletHandle); - public void setState(byte[] state) - { - this.state = state; - } + @Property(name = "state") + public abstract InputStream getState(); + + public abstract void setState(InputStream state); + + @Property(name = "cloned") + public abstract boolean getCloned(); + + public abstract void setCloned(boolean cloned); } Property changes on: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Copied: portal/trunk/component/portal/src/test/java/conf/portal/content-nodetypes.xml (from rev 463, portal/branches/wsrp-integration/component/portal/src/test/java/conf/portal/content-nodetypes.xml) =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/content-nodetypes.xml (rev 0) +++ portal/trunk/component/portal/src/test/java/conf/portal/content-nodetypes.xml 2009-11-09 11:39:22 UTC (rev 528) @@ -0,0 +1,45 @@ + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="mop:wsrpState" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>mop:customizationstate</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="portletId" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="cloned" requiredType="Boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> Modified: portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml 2009-11-09 11:39:22 UTC (rev 528) @@ -24,65 +24,67 @@ 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>jar:/conf/portal/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"/> - <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="system"/> - </properties-param> - </init-params> - </component> + <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>jar:/conf/portal/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"/> + <property name="dialect" value="hsqldb"/> + </properties-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="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/standalone/nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> -</configuration> \ No newline at end of file + <component> + <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> + <init-params> + <properties-param> + <name>locations</name> + <property name="repository" value="system"/> + </properties-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="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/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/component/portal/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/java/org/exoplatform/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-11-09 11:39:22 UTC (rev 528) @@ -463,6 +463,28 @@ }.execute(null); } + public void testClonePage() + { + new UnitTest() + { + public void execute() throws Exception + { + Page page = new Page(); + page.setOwnerType("group"); + page.setOwnerId("/platform/administrators"); + page.setName("whatever"); + page.setTitle("testTitle"); + userPortalConfigSer_.create(page); + + String newName = "newPage"; + Page newPage = userPortalConfigSer_.renewPage(page.getPageId(), newName, page.getOwnerType(), page.getOwnerId()); + assertEquals(newName, newPage.getName()); + assertEquals(page.getTitle(), newPage.getTitle()); + } + }.execute(null); + } + + public void testUpdatePage() { new UnitTest() Copied: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java (from rev 463, portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java) =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java (rev 0) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java 2009-11-09 11:39:22 UTC (rev 528) @@ -0,0 +1,91 @@ +/** + * 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 + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.config; + +import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.TransientApplicationState; +import org.exoplatform.portal.config.model.wsrp.WSRPApplication; +import org.exoplatform.portal.config.model.wsrp.WSRPId; +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.test.BasicTestCase; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class WSRPTest extends BasicTestCase +{ + + /** . */ + private DataStorage storage_; + + /** . */ + private POMSessionManager mgr; + + /** . */ + private POMSession session; + + public void setUp() throws Exception + { + super.setUp(); + if (storage_ != null) + { + return; + } + PortalContainer container = PortalContainer.getInstance(); + storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); + session = mgr.openSession(); + } + + protected void tearDown() throws Exception + { + mgr.closeSession(false); + } + + public void testBilto() throws Exception + { + + TransientApplicationState<WSRP> state = new TransientApplicationState<WSRP>(); + WSRP wsrp = new WSRP(); + String id = "portlet id"; + wsrp.setPortletId(id); + state.setContentState(wsrp); + WSRPApplication wsrpApplication = new WSRPApplication(new WSRPId("test")); + wsrpApplication.setState(state); + + Page container = new Page(); + String pageId = "portal::test::wsrp_page"; + container.setPageId(pageId); + container.getChildren().add(wsrpApplication); + + storage_.create(container); + + container = storage_.getPage(pageId); + wsrpApplication = (WSRPApplication)container.getChildren().get(0); + + wsrp = storage_.load(wsrpApplication.getState()); + assertNotNull(wsrp); + assertEquals(id, wsrp.getPortletId()); + } +} Property changes on: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/security ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/jibx ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/organization/management ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/organization/management/executive-board ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform/guests ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/group/platform/users ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/portal/classic ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/portal/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/portal/template/classic ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/portal/template/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/portal/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/containers ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/containers/four-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/containers/one-column ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/containers/three-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/containers/two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/empty ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/one-row-two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/three-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/three-rows ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/three-rows-two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/three-tabs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/two-columns ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/two-columns-one-row ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/two-rows ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/template/pages/two-tabs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/demo ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/john ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/mary ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/overwritelayout ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/root ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/template ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/portal/src/test/resources/portal/user/template/user ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/resources/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/jcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/conf/portal/testjcr ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/locale/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/locale/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/org/exoplatform/services/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/resources/src/test/java/org/exoplatform/services/resources/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/component/scripting/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org/exoplatform/commons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org/exoplatform/commons/utils ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/main/java/org/exoplatform/resolver ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/test/java/org/exoplatform/commons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/scripting/src/test/java/org/exoplatform/commons/utils ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/web/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/download ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/json ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/upload ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/util ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/application ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/annotation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/mvc ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/command ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/filter ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/login ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/security ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/download ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/download/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/json ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/json/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/web/command ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/java/org/exoplatform/web/filter ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/web/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/wsrp/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main/java/org/gatein ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main/java/org/gatein/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -25,11 +25,18 @@ import org.exoplatform.container.xml.InitParams; import org.gatein.pc.api.PortletInvoker; import org.gatein.pc.federation.FederatingPortletInvoker; +import org.gatein.pc.portlet.container.ContainerPortletInvoker; +import org.gatein.pc.portlet.impl.state.StateConverterV0; +import org.gatein.pc.portlet.impl.state.StateManagementPolicyService; +import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService; +import org.gatein.pc.portlet.state.StateConverter; import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker; import org.gatein.registration.RegistrationManager; import org.gatein.registration.RegistrationPersistenceManager; import org.gatein.registration.impl.RegistrationManagerImpl; import org.gatein.registration.impl.RegistrationPersistenceManagerImpl; +import org.gatein.registration.policies.DefaultRegistrationPolicy; +import org.gatein.registration.policies.DefaultRegistrationPropertyValidator; import org.gatein.wsrp.api.SessionEvent; import org.gatein.wsrp.api.SessionEventBroadcaster; import org.gatein.wsrp.api.SessionEventListener; @@ -64,7 +71,7 @@ private ConsumerRegistry consumerRegistry; public ExoKernelIntegration(InitParams params, ConfigurationManager configurationManager, - org.exoplatform.portal.pc.ExoKernelIntegration pc) throws Exception + org.exoplatform.portal.pc.ExoKernelIntegration pc) throws Exception { if (params != null) { @@ -103,10 +110,33 @@ RegistrationManager registrationManager = new RegistrationManagerImpl(); registrationManager.setPersistenceManager(registrationPersistenceManager); - // retrieve producer portlet invoker from container - ProducerPortletInvoker producerPortletInvoker = - (ProducerPortletInvoker)container.getComponentInstanceOfType(ProducerPortletInvoker.class); + // todo: the multiple instantiation of WSRP service causes the registration policy to not be properly initialized + // so we end up forcing its instantiation here. + DefaultRegistrationPolicy registrationPolicy = new DefaultRegistrationPolicy(); + registrationPolicy.setValidator(new DefaultRegistrationPropertyValidator()); + registrationManager.setPolicy(registrationPolicy); + // retrieve container portlet invoker from eXo kernel + ContainerPortletInvoker containerPortletInvoker = + (ContainerPortletInvoker)container.getComponentInstanceOfType(ContainerPortletInvoker.class); + + // The producer persistence manager + PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService(); + + // The producer state management policy + StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); + producerStateManagementPolicy.setPersistLocally(true); + + // The producer state converter + StateConverter producerStateConverter = new StateConverterV0(); + + // The producer portlet invoker + ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); + producerPortletInvoker.setNext(containerPortletInvoker); + producerPortletInvoker.setPersistenceManager(producerPersistenceManager); + producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); + producerPortletInvoker.setStateConverter(producerStateConverter); + // create and wire WSRP producer producer = ProducerHolder.getProducer(true); producer.setPortletInvoker(producerPortletInvoker); Property changes on: portal/trunk/component/xml-parser ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/chars ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/chars/chardet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/common ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/common/util ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/parser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/path ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/refs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/tidy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/html/util ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/rss ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/rss/parser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/text ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/text/unicode ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/token ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/token/attribute ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/parser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/serialize ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/main/java/org/exoplatform/services/xml/util ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/html ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/html/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/rss ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/services/parser/rss/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/java/org/exoplatform/test/crawler ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/component/xml-parser/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/images ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/_archive ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/_archive/integration ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/_orphans ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/configuration ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/development ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/gadgets ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/language ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/portlets ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/portletsUser ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/security ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/docs/user-guide/en/modules/terms ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/gadgets/core/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/conf/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/containers ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/containers/default ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/resources/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml 2009-11-09 11:39:22 UTC (rev 528) @@ -29,17 +29,17 @@ * --> <Module> - <ModulePrefs author="eXoPlatform" - title="Calculator" - directory_title="Caculator" - title_url="http://www.exoplatform.org" - description="This simple and useful calculator lets you perform most of the basic arithmetic operations." - thumbnail="http://localhost:8080/eXoGadgets/skin/DefaultSkin/portletIcons/Calculator..." - height="227"> - <Locale lang="ar" language_direction="rtl"/> - </ModulePrefs> - <Content type="html"> - <![CDATA[ + <ModulePrefs author="eXoPlatform" + title="Calculator" + directory_title="Caculator" + title_url="http://www.exoplatform.org" + description="This simple and useful calculator lets you perform most of the basic arithmetic operations." + thumbnail="http://localhost:8080/eXoGadgets/skin/DefaultSkin/portletIcons/Calculator..." + height="227"> + <Locale lang="ar" language_direction="rtl"/> + </ModulePrefs> + <Content type="html"> + <![CDATA[ <style type="text/css"> body { margin: 0; @@ -297,5 +297,5 @@ </div> </body> ]]> - </Content> + </Content> </Module> \ No newline at end of file Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calendar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/locale/Todo ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/image ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server ___________________________________________________________________ Name: svn:ignore - target + *.iml .idea Property changes on: portal/trunk/gadgets/server/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/config ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging ___________________________________________________________________ Name: svn:ignore - profiles.xml + *.iml .idea Property changes on: portal/trunk/packaging/module ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/packaging/module/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/module/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/module/src/main/javascript ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/pkg ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/packaging/pkg/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/pkg/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/pkg/src/main/assembly ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/product ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/packaging/product/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/product/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/product/src/main/javascript ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/packaging/reports ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/patch ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java =================================================================== --- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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,16 +28,7 @@ import javax.portlet.PortletPreferences; -/** - * set the event listeners. - */ -/** - * @author exo - */ @ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/dashboard/webui/component/UIDashboardPortlet.gtmpl", events = {}) -/** - * Dashboard portlet that display google gadgets - */ public class UIDashboardPortlet extends UIPortletApplication implements DashboardParent { private boolean isPrivate; @@ -73,7 +64,9 @@ PortletRequestContext context = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); String accessUser = context.getRemoteUser(); if (accessUser == null || accessUser.equals("")) + { return false; + } if ("__CURRENT_USER__".equals(owner)) { return true; @@ -81,7 +74,9 @@ if (isPrivate) { if (accessUser.equals(owner)) + { return true; + } } return false; } Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/resources/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/dashboard/src/main/webapp/skin/gadget/webui/component/UIGadgetPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/model ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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.lifecycle.UIFormLifecycle; import org.exoplatform.webui.core.model.SelectItemOption; 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.UIForm; import org.exoplatform.webui.form.UIFormInputInfo; import org.exoplatform.webui.form.UIFormInputSet; @@ -61,12 +61,7 @@ import java.util.List; import java.util.Set; -/** - * Created by The eXo Platform SAS - * Author : Pham Thanh Tung - * thanhtungty(a)gmail.com - * Jul 10, 2008 - */ +/** Created by The eXo Platform SAS Author : Pham Thanh Tung thanhtungty(a)gmail.com Jul 10, 2008 */ @ComponentConfig(template = "system:/groovy/webui/form/UIForm.gtmpl", lifecycle = UIFormLifecycle.class, events = { @EventConfig(listeners = UIAddApplicationForm.ChangeTypeActionListener.class, phase = Phase.DECODE), @EventConfig(listeners = UIAddApplicationForm.AddActionListener.class), Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -40,12 +40,7 @@ import javax.portlet.PortletPreferences; -/** - * Created by The eXo Platform SAS - * Author : Pham Thanh Tung - * thanhtungty(a)gmail.com - * Jun 24, 2008 - */ +/** Created by The eXo Platform SAS Author : Pham Thanh Tung thanhtungty(a)gmail.com Jun 24, 2008 */ @ComponentConfig(template = "app:/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl", events = { @EventConfig(listeners = UIApplicationOrganizer.ShowCategoryActionListener.class), @EventConfig(listeners = UIApplicationOrganizer.ImportAllApplicationsActionListener.class, confirm = "UIOrganizer.msg.importAll"), @@ -140,7 +135,9 @@ for (ApplicationCategory category : categories) { if (category.getName().equals(name)) + { return category; + } } return null; } @@ -179,7 +176,9 @@ for (Application ele : applications) { if (ele.getApplicationName().equals(name)) + { return ele; + } } return null; } @@ -267,7 +266,9 @@ uiOrganizer.setSelectedCategory(selectedCategory); } else + { uiOrganizer.reload(); + } return; } uiOrganizer.selectApplication(appName); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -29,8 +29,8 @@ import org.exoplatform.webui.core.UIApplication; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; 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.UIFormInputSet; import org.exoplatform.webui.form.UIFormStringInput; import org.exoplatform.webui.form.UIFormTabPane; @@ -44,12 +44,7 @@ import java.util.ArrayList; import java.util.Date; -/** - * Created by The eXo Platform SARL - * Author : Hoa Nguyen - * hoa.nguyen(a)exoplatform.com - * Jul 4, 2006 - */ +/** Created by The eXo Platform SARL Author : Hoa Nguyen hoa.nguyen(a)exoplatform.com Jul 4, 2006 */ @ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = { @EventConfig(listeners = UICategoryForm.SaveActionListener.class), @EventConfig(listeners = UICategoryForm.CancelActionListener.class, phase = Phase.DECODE)}) @@ -131,22 +126,32 @@ ApplicationCategory category = uiForm.getCategory(); boolean isCreateNew = category == null; if (isCreateNew) + { category = new ApplicationCategory(); + } UIFormInputSet uiSetting = uiForm.getChildById(FIELD_SETTING); UIFormInputSet uiPermission = uiForm.getChildById(FIELD_PERMISSION); category.setName(uiSetting.getUIStringInput(FIELD_NAME).getValue()); String displayName = uiSetting.getUIStringInput(FIELD_DISPLAY_NAME).getValue(); if (displayName == null || displayName.length() < 1) + { category.setDisplayName(category.getName()); + } else + { category.setDisplayName(displayName); + } category.setDescription(uiSetting.getUIStringInput(FIELD_DESCRIPTION).getValue()); UIListPermissionSelector uiListPermissionSelector = uiPermission.getChild(UIListPermissionSelector.class); ArrayList<String> pers = new ArrayList<String>(); if (uiListPermissionSelector.getValue() != null) + { for (String per : uiListPermissionSelector.getValue()) + { pers.add(per); + } + } category.setAccessPermissions(pers); ApplicationCategory existCategory = service.getApplicationCategory(category.getName()); if (!isCreateNew) @@ -197,7 +202,9 @@ uiOrganizer.setSelectedApplication(application); } else + { uiOrganizer.reload(); + } event.getRequestContext().addUIComponentToUpdateByAjax(uiOrganizer); } Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -48,8 +48,8 @@ import org.exoplatform.webui.core.UIVirtualList; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; 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 java.util.ArrayList; import java.util.List; @@ -107,14 +107,18 @@ public void addPageNavigation(PageNavigation navigation) { if (navigations == null) + { navigations = new ArrayList<PageNavigation>(); + } navigations.add(navigation); } public void deletePageNavigation(PageNavigation navigation) { if (navigations == null || navigations.size() < 1) + { return; + } navigations.remove(navigation); } @@ -123,7 +127,9 @@ for (PageNavigation ele : getPageNavigations()) { if (ele.getId() == id) + { return ele; + } } return null; } @@ -131,7 +137,9 @@ public List<PageNavigation> getPageNavigations() { if (navigations == null) + { navigations = new ArrayList<PageNavigation>(); + } return navigations; } @@ -279,7 +287,9 @@ // remove selected navigation if (uicomp.navigations == null || uicomp.navigations.size() < 1) + { return; + } uicomp.navigations.remove(navigation); // remove navigation from UIPortal Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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 @@ -52,9 +52,10 @@ import org.exoplatform.webui.core.UIRightClickPopupMenu; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; 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 javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Comparator; @@ -62,8 +63,6 @@ import java.util.List; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; - @ComponentConfigs({ @ComponentConfig(template = "app:/groovy/navigation/webui/component/UISiteManagement.gtmpl", events = { @EventConfig(name = "EditPortalLayout", listeners = UISiteManagement.EditPortalLayoutActionListener.class), @@ -155,17 +154,25 @@ PortalConfig[] pcs = new PortalConfig[tempArrayList.size()]; if (index < 0) + { throw new IllegalArgumentException("Illegal index: index must be a positive number"); + } if (length < 0) + { throw new IllegalArgumentException("Illegal length: length must be a positive number"); + } if (index + length > tempArrayList.size()) + { throw new IllegalArgumentException( "Illegal index or length: sum of the index and the length cannot be greater than the list size"); + } for (int i = 0; i < length; i++) + { pcs[i] = tempArrayList.get(i + index); + } return pcs; } @@ -202,13 +209,15 @@ else if (config != null) { uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.Invalid-deletePermission", - new String[]{config.getPortalConfig().getName()}));; + new String[]{config.getPortalConfig().getName()})); + ; return; } else { uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist", - new String[]{portalName}));; + new String[]{portalName})); + ; return; } @@ -302,7 +311,8 @@ UserACL userACL = uicomp.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(portalConfig)) { - uiApplication.addMessage(new ApplicationMessage("UISiteManagement.msg.Invalid-editPermission", null));; + uiApplication.addMessage(new ApplicationMessage("UISiteManagement.msg.Invalid-editPermission", null)); + ; return; } Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/resources/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/help ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/I18nPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/I18nPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/account/webui/component/model ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-09 11:39:22 UTC (rev 528) @@ -19,400 +19,398 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> +<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> + <portlet> + <description xml:lang="EN">Organization Portlet</description> + <portlet-name>OrganizationPortlet</portlet-name> + <display-name xml:lang="EN">Organization Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> -<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> - <portlet> - <description xml:lang="EN">Organization Portlet</description> - <portlet-name>OrganizationPortlet</portlet-name> - <display-name xml:lang="EN">Organization Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml</value> - </init-param> + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml</value> + </init-param> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.exoadmin.OrganizationPortlet</resource-bundle> - <portlet-info> - <title>Organization Portlet</title> - <short-title>Organization Portlet</short-title> - <keywords>Administration</keywords> - </portlet-info> - - <security-role-ref> - <role-name>admin</role-name> - <role-link>admin</role-link> - </security-role-ref> - <supported-processing-event><name>NewAccountAdded</name></supported-processing-event> - </portlet> - - <portlet> - <description xml:lang="EN">Account Portlet</description> - <portlet-name>AccountPortlet</portlet-name> - <display-name xml:lang="EN">Account Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml</value> - </init-param> + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.OrganizationPortlet</resource-bundle> + <portlet-info> + <title>Organization Portlet</title> + <short-title>Organization Portlet</short-title> + <keywords>Administration</keywords> + </portlet-info> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - - <resource-bundle>locale.portlet.exoadmin.AccountPortlet</resource-bundle> - <portlet-info> - <title>Account Portlet</title> - <short-title>Account Portlet</short-title> - <keywords>Administration</keywords> - </portlet-info> - </portlet> - -  + <portlet> + <description xml:lang="EN">Account Portlet</description> + <portlet-name>AccountPortlet</portlet-name> + <display-name xml:lang="EN">Account Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - <portlet> - <description xml:lang="EN">Group Navigation Portlet</description> - <portlet-name>GroupNavigationPortlet</portlet-name> - <display-name xml:lang="EN">Group Navigation Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml</value> - </init-param> + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml</value> + </init-param> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - - <resource-bundle>locale.portlet.exoadmin.GroupNavigationPortlet</resource-bundle> - <portlet-info> - <title>Group Navigation Portlet</title> - <short-title>Group Navigation Portlet</short-title> - <keywords>Administration</keywords> - </portlet-info> - </portlet> - - <portlet> - <description xml:lang="EN">Portal Navigation Portlet</description> - <portlet-name>PortalNavigationPortlet</portlet-name> - <display-name xml:lang="EN">Portal Navigation Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml</value> - </init-param> + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - - <resource-bundle>locale.portlet.exoadmin.PortalNavigationPortlet</resource-bundle> - <portlet-info> - <title>Portal Navigation Portlet</title> - <short-title>Portal Navigation Portlet</short-title> - <keywords>System</keywords> - </portlet-info> - </portlet> - - <portlet> - <description xml:lang="EN">Page Management Portlet</description> - <portlet-name>PageManagementPortlet</portlet-name> - <display-name xml:lang="EN">Page Management Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml</value> - </init-param> + <resource-bundle>locale.portlet.exoadmin.AccountPortlet</resource-bundle> + <portlet-info> + <title>Account Portlet</title> + <short-title>Account Portlet</short-title> + <keywords>Administration</keywords> + </portlet-info> + </portlet> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - - <resource-bundle>locale.portlet.exoadmin.AccountPortlet</resource-bundle> - <portlet-info> - <title>Page Management Portlet</title> - <short-title>Page Management Portlet</short-title> - <keywords>Administration</keywords> - </portlet-info> - </portlet> - - <portlet> - <description xml:lang="EN">Internationalization Portlet</description> - <portlet-name>I18nPortlet</portlet-name> - <display-name xml:lang="EN">Internationalization Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/I18nPortlet/webui/configuration.xml</value> - </init-param> +  - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.exoadmin.StarToolbarPortlet</resource-bundle> - <portlet-info> - <title>User Info Portlet</title> - <short-title>UserInfo</short-title> - <keywords>System, UserInfo</keywords> - </portlet-info> - - <security-role-ref> - <role-name>admin</role-name> - <role-link>admin</role-link> - </security-role-ref> - </portlet> + <portlet> + <description xml:lang="EN">Group Navigation Portlet</description> + <portlet-name>GroupNavigationPortlet</portlet-name> + <display-name xml:lang="EN">Group Navigation Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - <portlet> - <description xml:lang="EN">User Toolbar Site Portlet</description> - <portlet-name>UserToolbarSitePortlet</portlet-name> - <display-name xml:lang="EN">User Toolbar Site Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml</value> - </init-param> + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml</value> + </init-param> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.exoadmin.UserToolbarPortlet</resource-bundle> - <portlet-info> - <title>User Toolbar Site Portlet</title> - <short-title>UserToolbarSite</short-title> - <keywords>System</keywords> - </portlet-info> - - <security-role-ref> - <role-name>admin</role-name> - <role-link>admin</role-link> - </security-role-ref> - </portlet> - - <portlet> - <description xml:lang="EN">User Toolbar Dashboard Portlet</description> - <portlet-name>UserToolbarDashboardPortlet</portlet-name> - <display-name xml:lang="EN">User Toolbar Dashboard Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml</value> - </init-param> + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.exoadmin.UserToolbarPortlet</resource-bundle> - <portlet-info> - <title>User Toolbar Dashboard Portlet</title> - <short-title>UserToolbarDashboard</short-title> - <keywords>System</keywords> - </portlet-info> - - <security-role-ref> - <role-name>admin</role-name> - <role-link>admin</role-link> - </security-role-ref> - </portlet> - + <resource-bundle>locale.portlet.exoadmin.GroupNavigationPortlet</resource-bundle> + <portlet-info> + <title>Group Navigation Portlet</title> + <short-title>Group Navigation Portlet</short-title> + <keywords>Administration</keywords> + </portlet-info> + </portlet> + <portlet> - <description xml:lang="EN">User Toolbar Group Portlet</description> - <portlet-name>UserToolbarGroupPortlet</portlet-name> - <display-name xml:lang="EN">User Toolbar Group Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml</value> - </init-param> + <description xml:lang="EN">Portal Navigation Portlet</description> + <portlet-name>PortalNavigationPortlet</portlet-name> + <display-name xml:lang="EN">Portal Navigation Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.exoadmin.UserToolbarPortlet</resource-bundle> - <portlet-info> - <title>User Toolbar Group Portlet</title> - <short-title>UserToolbarGroup</short-title> - <keywords>System</keywords> - </portlet-info> - - <security-role-ref> - <role-name>admin</role-name> - <role-link>admin</role-link> - </security-role-ref> - </portlet> + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + + <resource-bundle>locale.portlet.exoadmin.PortalNavigationPortlet</resource-bundle> + <portlet-info> + <title>Portal Navigation Portlet</title> + <short-title>Portal Navigation Portlet</short-title> + <keywords>System</keywords> + </portlet-info> + </portlet> + <portlet> - <description xml:lang="EN">Star Toolbar Portlet</description> - <portlet-name>StarToolbarPortlet</portlet-name> - <display-name xml:lang="EN">Star Toolbar Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml</value> - </init-param> + <description xml:lang="EN">Page Management Portlet</description> + <portlet-name>PageManagementPortlet</portlet-name> + <display-name xml:lang="EN">Page Management Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.exoadmin.StarToolbarPortlet</resource-bundle> - <portlet-info> - <title>Star Toolbar Portlet</title> - <short-title>Star Toolbar</short-title> - <keywords>System</keywords> - </portlet-info> - </portlet> - + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + + <resource-bundle>locale.portlet.exoadmin.AccountPortlet</resource-bundle> + <portlet-info> + <title>Page Management Portlet</title> + <short-title>Page Management Portlet</short-title> + <keywords>Administration</keywords> + </portlet-info> + </portlet> + + <portlet> + <description xml:lang="EN">Internationalization Portlet</description> + <portlet-name>I18nPortlet</portlet-name> + <display-name xml:lang="EN">Internationalization Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/I18nPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.I18nPortlet</resource-bundle> + <portlet-info> + <title>Internationalization Portlet</title> + <short-title>Internationalization</short-title> + <keywords>Administration</keywords> + </portlet-info> + </portlet> + + <portlet> + <description xml:lang="EN">Application Registry</description> + <portlet-name>ApplicationRegistryPortlet</portlet-name> + <display-name xml:lang="EN">Application Registry</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>edit</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.ApplicationRegistryPortlet</resource-bundle> + <portlet-info> + <title>Application Registry Portlet</title> + <short-title>Registry</short-title> + <keywords>Administration</keywords> + </portlet-info> + + <security-role-ref> + <role-name>admin</role-name> + <role-link>admin</role-link> + </security-role-ref> + </portlet> + + <portlet> + <description xml:lang="EN">Administration Toolbar Portlet</description> + <portlet-name>AdminToolbarPortlet</portlet-name> + <display-name xml:lang="EN">Administration Toolbar Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en,fr,vi,ar</supported-locale> + <resource-bundle>locale.portlet.exoadmin.AdminToolbarPortlet</resource-bundle> + <portlet-info> + <title>Administration Toolbar Portlet</title> + <short-title>Administration Toolbar</short-title> + <keywords>System</keywords> + </portlet-info> + </portlet> + + <portlet> + <description xml:lang="EN">User Info Portlet</description> + <portlet-name>UserInfoPortlet</portlet-name> + <display-name xml:lang="EN">User Info Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.StarToolbarPortlet</resource-bundle> + <portlet-info> + <title>User Info Portlet</title> + <short-title>UserInfo</short-title> + <keywords>System, UserInfo</keywords> + </portlet-info> + + <security-role-ref> + <role-name>admin</role-name> + <role-link>admin</role-link> + </security-role-ref> + </portlet> + + <portlet> + <description xml:lang="EN">User Toolbar Site Portlet</description> + <portlet-name>UserToolbarSitePortlet</portlet-name> + <display-name xml:lang="EN">User Toolbar Site Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.UserToolbarPortlet</resource-bundle> + <portlet-info> + <title>User Toolbar Site Portlet</title> + <short-title>UserToolbarSite</short-title> + <keywords>System</keywords> + </portlet-info> + + <security-role-ref> + <role-name>admin</role-name> + <role-link>admin</role-link> + </security-role-ref> + </portlet> + + <portlet> + <description xml:lang="EN">User Toolbar Dashboard Portlet</description> + <portlet-name>UserToolbarDashboardPortlet</portlet-name> + <display-name xml:lang="EN">User Toolbar Dashboard Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.UserToolbarPortlet</resource-bundle> + <portlet-info> + <title>User Toolbar Dashboard Portlet</title> + <short-title>UserToolbarDashboard</short-title> + <keywords>System</keywords> + </portlet-info> + + <security-role-ref> + <role-name>admin</role-name> + <role-link>admin</role-link> + </security-role-ref> + </portlet> + + <portlet> + <description xml:lang="EN">User Toolbar Group Portlet</description> + <portlet-name>UserToolbarGroupPortlet</portlet-name> + <display-name xml:lang="EN">User Toolbar Group Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.UserToolbarPortlet</resource-bundle> + <portlet-info> + <title>User Toolbar Group Portlet</title> + <short-title>UserToolbarGroup</short-title> + <keywords>System</keywords> + </portlet-info> + + <security-role-ref> + <role-name>admin</role-name> + <role-link>admin</role-link> + </security-role-ref> + </portlet> + <portlet> + <description xml:lang="EN">Star Toolbar Portlet</description> + <portlet-name>StarToolbarPortlet</portlet-name> + <display-name xml:lang="EN">Star Toolbar Portlet</display-name> + <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> + + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml</value> + </init-param> + + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>help</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <resource-bundle>locale.portlet.exoadmin.StarToolbarPortlet</resource-bundle> + <portlet-info> + <title>Star Toolbar Portlet</title> + <short-title>Star Toolbar</short-title> + <keywords>System</keywords> + </portlet-info> + </portlet> + </portlet-app> \ No newline at end of file Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/organization/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/resources/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/resources/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/DefaultSkin/portletIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/MacSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/MacSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/VistaSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/account/webui/component/UIAccountPortlet/UILoginForm/VistaSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/admintoolbar/webui/component/UIAdminToolbarPortlet/DefaultSkin/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/webui/component/UII18nPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web ___________________________________________________________________ Name: svn:ignore - target + target *.iml .idea Property changes on: portal/trunk/portlet/web/src ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/java/org/exoplatform ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Modified: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java =================================================================== --- portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java 2009-11-09 11:13:18 UTC (rev 527) +++ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java 2009-11-09 11:39:22 UTC (rev 528) @@ -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,9 +38,7 @@ import org.exoplatform.webui.form.validator.MandatoryValidator; import org.exoplatform.webui.form.validator.URLValidator; -/** - * Created by The eXo Platform SAS Author : eXoPlatform October 2, 2009 - */ +/** Created by The eXo Platform SAS Author : eXoPlatform October 2, 2009 */ @ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormWithTitle.gtmpl", events = {@EventConfig(listeners = UILogoEditMode.SaveActionListener.class)}) public class UILogoEditMode extends UIForm { @@ -61,11 +59,12 @@ { UILogoEditMode uiForm = event.getSource(); String url = uiForm.getUIStringInput(FIELD_URL).getValue(); - if (url != null && !url.trim().matches(URLValidator.URL_REGEX)) { - UILogoPortlet uiPortlet = uiForm.getParent(); - uiForm.getUIStringInput(FIELD_URL).setValue(uiPortlet.getURL()); - Object[] args = {FIELD_URL, "URL"}; - throw new MessageException(new ApplicationMessage("ExpressionValidator.msg.value-invalid", args)); + if (url != null && !url.trim().matches(URLValidator.URL_REGEX)) + { + UILogoPortlet uiPortlet = uiForm.getParent(); + uiForm.getUIStringInput(FIELD_URL).setValue(uiPortlet.getURL()); + Object[] args = {FIELD_URL, "URL"}; + throw new MessageException(new ApplicationMessage("ExpressionValidator.msg.value-invalid", args)); } PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); PortletPreferences pref = pcontext.getRequest().getPreferences(); @@ -74,7 +73,9 @@ UIPortalApplication portalApp = Util.getUIPortalApplication(); if (portalApp.getModeState() == UIPortalApplication.NORMAL_MODE) + { pcontext.setApplicationMode(PortletMode.VIEW); + } } } } Property changes on: portal/trunk/portlet/web/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/resources/tomcat ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy/groovy ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy/groovy/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy/groovy/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/DefaultSkin/portletIcons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/icons ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/icons/16x16 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBrowserPortlet/DefaultSkin/icons/24x24 ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIFooterPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIFooterPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIFooterPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background ___________________________________________________________________ Name: svn:ignore + *.iml .idea Property changes on: portal/trunk/portlet/web/src/test ___________________________________________________________________ Name: svn:ignore + *.iml .idea

15 years, 1 month

1
0
0 / 0

gatein SVN: r527 - portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2009-11-09 06:13:18 -0500 (Mon, 09 Nov 2009) New Revision: 527 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java Log: GTNPORTAL-131: Javascript deployment Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2009-11-09 10:41:01 UTC (rev 526) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2009-11-09 11:13:18 UTC (rev 527) @@ -51,26 +51,35 @@ */ public void onEvent(WebAppEvent arg0) { - if(arg0 instanceof WebAppLifeCycleEvent){ + if (arg0 instanceof WebAppLifeCycleEvent) + { WebAppLifeCycleEvent wevent = (WebAppLifeCycleEvent)arg0; - if(wevent.getType() == WebAppLifeCycleEvent.REMOVED){ + if (wevent.getType() == WebAppLifeCycleEvent.REMOVED) + { removeJavascript(wevent.getWebApp().getServletContext()); refreshJavascript(); } } } - - /** Remove javascript deployed in this web app **/ - private void removeJavascript(ServletContext scontext){ + + /** Remove javascript deployed in this web app * */ + private void removeJavascript(ServletContext scontext) + { String webApp = scontext.getContextPath(); List<JavascriptKey> jsKeys = JavascriptDependentManager.getDeployedJScripts(webApp); - for(JavascriptKey key : jsKeys){ + if (jsKeys == null) + { + return; + } + for (JavascriptKey key : jsKeys) + { javascriptService.removeJavascript(key, scontext); - } + } JavascriptDependentManager.clearAssociatedJScripts(webApp); } - - private void refreshJavascript(){ + + private void refreshJavascript() + { javascriptService.refreshMergedJavascript(); }

15 years, 1 month

1
0
0 / 0

gatein SVN: r526 - portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2009-11-09 05:41:01 -0500 (Mon, 09 Nov 2009) New Revision: 526 Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java Log: GTNPORTAL-131: Javascript deployment Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2009-11-09 09:24:53 UTC (rev 525) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2009-11-09 10:41:01 UTC (rev 526) @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.ServletContext; @@ -50,6 +52,9 @@ private JavascriptDeployer deployer; private JavascriptRemoval removal; + + /** Used to clear merged Javascript on undeploying an webapp */ + private Map<String, List<String>> object_view_of_merged_JS; public JavascriptConfigService(ExoContainerContext context) { @@ -58,6 +63,7 @@ extendedJavascripts = new HashMap<String, String>(); deployer = new JavascriptDeployer(context.getPortalContainerName(), this); removal = new JavascriptRemoval(context.getPortalContainerName(), this); + object_view_of_merged_JS = new HashMap<String, List<String>>(); } /** @@ -94,6 +100,13 @@ String servletContextName = scontext.getServletContextName(); availableScripts_.add(module); availableScriptsPaths_.add("/" + servletContextName + scriptPath); + + List<String> mergedJS_list = object_view_of_merged_JS.get("/" + servletContextName); + if(mergedJS_list == null){ + mergedJS_list = new ArrayList<String>(); + object_view_of_merged_JS.put("/" + servletContextName, mergedJS_list); + } + StringBuffer sB = new StringBuffer(); String line = ""; try @@ -103,7 +116,9 @@ { while ((line = reader.readLine()) != null) { - sB.append(line + "\n"); + line = line + "\n"; + sB.append(line); + mergedJS_list.add(line); } } catch (Exception ex) @@ -126,15 +141,28 @@ e.printStackTrace(); } sB.append("\n"); + mergedJS_list.add("\n"); + mergedJavascript = mergedJavascript.concat(sB.toString()); } public void removeJavascript(JavascriptKey key, ServletContext scontext){ - + String contextPath = scontext.getContextPath(); + availableScripts_.remove(key.getModule()); + availableScriptsPaths_.remove(contextPath + key.getScriptPath()); + object_view_of_merged_JS.remove(contextPath); } + /** Refresh the mergedJavascript **/ public void refreshMergedJavascript(){ - + mergedJavascript = ""; + StringBuffer buffer = new StringBuffer(); + for(String webApp : object_view_of_merged_JS.keySet()){ + for(String jsPath : object_view_of_merged_JS.get(webApp)){ + buffer.append(jsPath); + } + } + mergedJavascript = buffer.toString(); } public byte[] getMergedJavascript() Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java (rev 0) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java 2009-11-09 10:41:01 UTC (rev 526) @@ -0,0 +1,58 @@ +/* + * 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 + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.web.application.javascript; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> + * @version $Id$ + * + */ +public class JavascriptDependentManager +{ + private static Map<String, List<JavascriptKey>> webApp_JScripts_map = new HashMap<String, List<JavascriptKey>>(); + + public static void addJavascriptDependent(String webApp, List<JavascriptKey> jsKeys) + { + List<JavascriptKey> deployedJSs = webApp_JScripts_map.get(webApp); + if (deployedJSs == null) + { + deployedJSs = new ArrayList<JavascriptKey>(); + webApp_JScripts_map.put(webApp, deployedJSs); + } + for(JavascriptKey key : jsKeys){ + deployedJSs.add(key); + } + } + + public static void clearAssociatedJScripts(String webApp) + { + webApp_JScripts_map.remove(webApp); + } + + public static List<JavascriptKey> getDeployedJScripts(String webApp) + { + return webApp_JScripts_map.get(webApp); + } + +} Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java (rev 0) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java 2009-11-09 10:41:01 UTC (rev 526) @@ -0,0 +1,64 @@ +/* + * 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 + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.web.application.javascript; + +/** + * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> + * @version $Id$ + * + */ +public class JavascriptKey +{ + + private String module; + + private String scriptPath; + + public JavascriptKey(String _module, String _scriptPath) throws IllegalArgumentException{ + if(_module == null || _scriptPath == null){ + throw new IllegalArgumentException("Module and scriptPath are mandatory for JavascriptKey"); + } + this.module = _module; + this.scriptPath = _scriptPath; + } + + @Override + public boolean equals(Object obj) + { + if(this == null || obj == null){ + return this == null && obj == null; + } + + if(!(obj instanceof JavascriptKey)){ + return false; + }else{ + JavascriptKey target = (JavascriptKey)obj; + return module.equals(target.module) && scriptPath.equals(target.scriptPath); + } + + } + + public String getModule(){ + return module; + } + + public String getScriptPath(){ + return scriptPath; + } +}

15 years, 1 month

1
0
0 / 0

gatein SVN: r525 - portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2009-11-09 04:24:53 -0500 (Mon, 09 Nov 2009) New Revision: 525 Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java Log: GTNPORTAL-131: Javascript deployment Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2009-11-09 08:56:38 UTC (rev 524) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2009-11-09 09:24:53 UTC (rev 525) @@ -33,20 +33,23 @@ /** * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> * @version $Id$ - * + * */ public class JavascriptConfigParser { - public static void processConfigResource(InputStream is, JavascriptConfigService service, ServletContext scontext){ + public static void processConfigResource(InputStream is, JavascriptConfigService service, ServletContext scontext) + { List<JavascriptTask> tasks = fetchTasks(is); - if(tasks != null){ - for(JavascriptTask task : tasks){ + if (tasks != null) + { + for (JavascriptTask task : tasks) + { task.execute(service, scontext); } } } - + private static List<JavascriptTask> fetchTasks(InputStream is) { try @@ -60,42 +63,53 @@ return null; } } - - private static List<JavascriptTask> fetchTasksFromXMLConfig(Document document){ + + private static List<JavascriptTask> fetchTasksFromXMLConfig(Document document) + { List<JavascriptTask> tasks = new ArrayList<JavascriptTask>(); Element element = document.getDocumentElement(); - //NodeList nodes = element.getElementsByTagName(GateinResource.JAVA_SCRIPT_TAG); + // NodeList nodes = + // element.getElementsByTagName(GateinResource.JAVA_SCRIPT_TAG); NodeList nodes = element.getElementsByTagName("javascript"); int length = nodes.getLength(); - for(int i = 0; i < length; i++){ + for (int i = 0; i < length; i++) + { JavascriptTask task = xmlToTask((Element)nodes.item(i)); - if(task != null){ + if (task != null) + { tasks.add(task); } } return tasks; } - - private static JavascriptTask xmlToTask(Element element){ - //if(!GateinResource.JAVA_SCRIPT_TAG.equals(element.getTagName())){ - if(!"javascript".equals(element.getTagName())){ + + private static JavascriptTask xmlToTask(Element element) + { + // if(!GateinResource.JAVA_SCRIPT_TAG.equals(element.getTagName())){ + if (!"javascript".equals(element.getTagName())) + { return null; } - try{ + try + { JavascriptTask task = new JavascriptTask(); - //NodeList nodes = element.getElementsByTagName(GateinResource.JAVA_SCRIPT_PARAM); + // NodeList nodes = + // element.getElementsByTagName(GateinResource.JAVA_SCRIPT_PARAM); NodeList nodes = element.getElementsByTagName("param"); int length = nodes.getLength(); - for(int i = 0; i < length ; i++){ + for (int i = 0; i < length; i++) + { Element param_ele = (Element)nodes.item(i); String js_module = param_ele.getElementsByTagName("js-module").item(0).getFirstChild().getNodeValue(); String js_path = param_ele.getElementsByTagName("js-path").item(0).getFirstChild().getNodeValue(); - task.addParam(js_module, js_path); + task.addJSKey(js_module, js_path); } return task; - }catch(Exception ex){ + } + catch (Exception ex) + { ex.printStackTrace(); return null; } - } + } } Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2009-11-09 08:56:38 UTC (rev 524) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2009-11-09 09:24:53 UTC (rev 525) @@ -49,17 +49,20 @@ /** . */ private JavascriptDeployer deployer; + private JavascriptRemoval removal; + public JavascriptConfigService(ExoContainerContext context) { availableScripts_ = new ArrayList<String>(); availableScriptsPaths_ = new ArrayList<String>(); extendedJavascripts = new HashMap<String, String>(); deployer = new JavascriptDeployer(context.getPortalContainerName(), this); + removal = new JavascriptRemoval(context.getPortalContainerName(), this); } /** - * return a collection list This method should return the - * availables scripts in the service + * return a collection list This method should return the availables scripts + * in the service * * @return */ @@ -81,6 +84,10 @@ availableScriptsPaths_.add(path); extendedJavascripts.put(path, scriptData); } + + public void addJavascript(JavascriptKey key, ServletContext scontext){ + addJavascript(key.getModule(), key.getScriptPath(), scontext); + } public void addJavascript(String module, String scriptPath, ServletContext scontext) { @@ -121,6 +128,14 @@ sB.append("\n"); mergedJavascript = mergedJavascript.concat(sB.toString()); } + + public void removeJavascript(JavascriptKey key, ServletContext scontext){ + + } + + public void refreshMergedJavascript(){ + + } public byte[] getMergedJavascript() { @@ -165,10 +180,13 @@ public void start() { DefaultServletContainerFactory.getInstance().getServletContainer().addWebAppListener(deployer); + DefaultServletContainerFactory.getInstance().getServletContainer().addWebAppListener(removal); } public void stop() { DefaultServletContainerFactory.getInstance().getServletContainer().removeWebAppListener(deployer); + DefaultServletContainerFactory.getInstance().getServletContainer().removeWebAppListener(removal); } + } \ No newline at end of file Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java (rev 0) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2009-11-09 09:24:53 UTC (rev 525) @@ -0,0 +1,87 @@ +/* + * 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 + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.web.application.javascript; + +import java.util.List; + +import javax.servlet.ServletContext; + +import org.gatein.wci.WebAppEvent; +import org.gatein.wci.WebAppLifeCycleEvent; +import org.gatein.wci.WebAppListener; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.picocontainer.Startable; + +/** + * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> + * @version $Id$ + * + */ +public class JavascriptRemoval implements WebAppListener, Startable +{ + + private String portalContainerName; + + private JavascriptConfigService javascriptService; + + public JavascriptRemoval(String _portalContainerName, JavascriptConfigService _javascriptService) + { + this.portalContainerName = _portalContainerName; + this.javascriptService = _javascriptService; + } + + /** + * @see org.gatein.wci.WebAppListener#onEvent(org.gatein.wci.WebAppEvent) + */ + public void onEvent(WebAppEvent arg0) + { + if(arg0 instanceof WebAppLifeCycleEvent){ + WebAppLifeCycleEvent wevent = (WebAppLifeCycleEvent)arg0; + if(wevent.getType() == WebAppLifeCycleEvent.REMOVED){ + removeJavascript(wevent.getWebApp().getServletContext()); + refreshJavascript(); + } + } + } + + /** Remove javascript deployed in this web app **/ + private void removeJavascript(ServletContext scontext){ + String webApp = scontext.getContextPath(); + List<JavascriptKey> jsKeys = JavascriptDependentManager.getDeployedJScripts(webApp); + for(JavascriptKey key : jsKeys){ + javascriptService.removeJavascript(key, scontext); + } + JavascriptDependentManager.clearAssociatedJScripts(webApp); + } + + private void refreshJavascript(){ + javascriptService.refreshMergedJavascript(); + } + + public void start() + { + DefaultServletContainerFactory.getInstance().getServletContainer().addWebAppListener(this); + } + + public void stop() + { + DefaultServletContainerFactory.getInstance().getServletContainer().removeWebAppListener(this); + } + +} Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java 2009-11-09 08:56:38 UTC (rev 524) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java 2009-11-09 09:24:53 UTC (rev 525) @@ -23,39 +23,32 @@ import javax.servlet.ServletContext; - /** * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> * @version $Id$ - * + * */ public class JavascriptTask { - - private List<Parameter> parameters; - - public JavascriptTask(){ - parameters = new ArrayList<Parameter>(); + + private List<JavascriptKey> jsKeys; + + public JavascriptTask() + { + jsKeys = new ArrayList<JavascriptKey>(); } - - public void execute(JavascriptConfigService service, ServletContext scontext){ - for(Parameter param : parameters){ - service.addJavascript(param.moduleName, param.scriptPath, scontext); + + public void execute(JavascriptConfigService service, ServletContext scontext) + { + for (JavascriptKey key : jsKeys) + { + service.addJavascript(key, scontext); } + JavascriptDependentManager.addJavascriptDependent(scontext.getContextPath(), jsKeys); } - - public void addParam(String moduleName, String scriptPath){ - parameters.add(new Parameter(moduleName, scriptPath)); + + public void addJSKey(String moduleName, String scriptPath) + { + jsKeys.add(new JavascriptKey(moduleName, scriptPath)); } - - private class Parameter { - - private String moduleName; - private String scriptPath; - - Parameter(String _moduleName, String _scriptPath){ - moduleName = _moduleName; - scriptPath = _scriptPath; - } - } }

15 years, 1 month

1
0
0 / 0

gatein SVN: r524 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 3 other directories.

by do-not-reply＠jboss.org

Author: truong.le Date: 2009-11-09 03:56:38 -0500 (Mon, 09 Nov 2009) New Revision: 524 Added: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryEditMode.java Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl Log: GTNPORTAL-149: the Auto Import function should be optional by portlet preference Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-11-09 08:56:38 UTC (rev 524) @@ -30,6 +30,7 @@ import org.exoplatform.services.jcr.ext.registry.RegistryService; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.GroupEventListener; +import org.exoplatform.services.organization.GroupHandler; import org.exoplatform.services.organization.OrganizationService; /** @@ -45,11 +46,11 @@ ExoContainer container = ExoContainerContext.getCurrentContainer(); UserPortalConfigService portalConfigService = (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class); + String groupId = group.getId().trim(); // Remove all descendant navigations removeGroupNavigation(group, portalConfigService); - - String groupId = group.getId().trim(); + portalConfigService.removeUserPortalConfig(PortalConfig.GROUP_TYPE, groupId); } @@ -142,7 +143,11 @@ private void removeGroupNavigation(Group group, UserPortalConfigService portalConfigService) throws Exception { - Collection<String> descendantGroups = getDescendantGroups(group); + ExoContainer container = ExoContainerContext.getCurrentContainer(); + OrganizationService orgService = + (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class); + GroupHandler groupHandler = orgService.getGroupHandler(); + Collection<String> descendantGroups = getDescendantGroups(group, groupHandler); PageNavigation navigation = null; for (String childGroup : descendantGroups) { @@ -152,17 +157,14 @@ } } - private Collection<String> getDescendantGroups(Group group) throws Exception + private Collection<String> getDescendantGroups(Group group, GroupHandler groupHandler) throws Exception { - ExoContainer container = ExoContainerContext.getCurrentContainer(); - OrganizationService orgService = - (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class); - Collection<Group> groupCollection = orgService.getGroupHandler().findGroups(group); + Collection<Group> groupCollection = groupHandler.findGroups(group); Collection<String> col = new ArrayList<String>(); for (Group childGroup : groupCollection) { col.add(childGroup.getId()); - col.addAll(getDescendantGroups(childGroup)); + col.addAll(getDescendantGroups(childGroup, groupHandler)); } return col; } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-09 08:56:38 UTC (rev 524) @@ -27,6 +27,7 @@ import org.exoplatform.portal.webui.portal.UIPortal; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.application.portlet.PortletRequestContext; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIApplication; @@ -37,6 +38,8 @@ import java.util.List; +import javax.portlet.PortletPreferences; + /** * Created by The eXo Platform SAS * Author : Pham Thanh Tung @@ -193,6 +196,13 @@ } } } + + public boolean isShowImport() + { + PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); + PortletPreferences pref = pcontext.getRequest().getPreferences(); + return Boolean.parseBoolean(pref.getValue("showImport", "true")); + } public void processRender(WebuiRequestContext context) throws Exception { Added: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryEditMode.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryEditMode.java (rev 0) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryEditMode.java 2009-11-09 08:56:38 UTC (rev 524) @@ -0,0 +1,78 @@ +/* + * 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 + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.applicationregistry.webui.component; + +import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.application.portlet.PortletRequestContext; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; +import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; +import org.exoplatform.webui.form.UIForm; +import org.exoplatform.webui.form.UIFormCheckBoxInput; + +import javax.portlet.PortletMode; +import javax.portlet.PortletPreferences; + +/** + * @author <a href="mailto:truong.le@exoplatform.com">Truong Le</a> + * @version $Id$ + * + */ +@ComponentConfig(lifecycle = UIFormLifecycle.class, + template = "system:/groovy/webui/form/UIFormWithTitle.gtmpl", + events = {@EventConfig(listeners = UIApplicationRegistryEditMode.SaveActionListener.class)} + ) + +public class UIApplicationRegistryEditMode extends UIForm +{ + public static final String SHOW_IMPORT = "showImport"; + + public UIApplicationRegistryEditMode() throws Exception + { + PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); + PortletPreferences pref = pcontext.getRequest().getPreferences(); + boolean isShowImport = Boolean.parseBoolean(pref.getValue(SHOW_IMPORT,"true")); + addUIFormInput(new UIFormCheckBoxInput<Boolean>(SHOW_IMPORT, SHOW_IMPORT, isShowImport).setValue(isShowImport)); + } + + static public class SaveActionListener extends EventListener<UIApplicationRegistryEditMode> + { + + @Override + public void execute(Event<UIApplicationRegistryEditMode> event) throws Exception + { + // TODO Auto-generated method stub + UIApplicationRegistryEditMode uiForm = event.getSource(); + boolean isShowImport = uiForm.getUIFormCheckBoxInput(SHOW_IMPORT).isChecked(); + PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); + PortletPreferences pref = pcontext.getRequest().getPreferences(); + pref.setValue(SHOW_IMPORT, Boolean.toString(isShowImport)); + pref.store(); + UIPortalApplication portalApp = Util.getUIPortalApplication(); + if (portalApp.getModeState() == UIPortalApplication.NORMAL_MODE) + pcontext.setApplicationMode(PortletMode.VIEW); + + } + + } +} Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java 2009-11-09 08:56:38 UTC (rev 524) @@ -36,6 +36,7 @@ addChild(UIApplicationOrganizer.class, null, null).setRendered(true); addChild(UIPortletManagement.class, null, null).setRendered(false); addChild(UIGadgetManagement.class, null, null).setRendered(false); + addChild(UIApplicationRegistryEditMode.class,null,null).setRendered(false); } @Override Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2009-11-09 08:56:38 UTC (rev 524) @@ -63,7 +63,7 @@ <UIOrganizer> <label> <addCategory>أضف فئة</addCategory> - <autoImport>استيراد</autoImport> + <autoImport>إستيراد تطبيقات</autoImport> <categories>الفئات</categories> </label> <title> @@ -84,7 +84,18 @@ <applicationNoExist>.هذه الخدمة لم تعد في قاعدة البيانات</applicationNoExist> </msg> </UIOrganizer> +  + <UIApplicationRegistryEditMode> + <title>Import Applications</title> + <label> + <showImport>Change Show Import</showImport> + </label> + </UIApplicationRegistryEditMode> + +  <UIPermissionForm> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2009-11-09 08:56:38 UTC (rev 524) @@ -31,7 +31,7 @@ ## org.exoplatform.applicationregistry.webui.component.UIApplicationOrganizer UIOrganizer.label.addCategory=Add Category -UIOrganizer.label.autoImport=Auto Import +UIOrganizer.label.autoImport=Import Applications UIOrganizer.label.categories=Categories UIOrganizer.title.editCategory=Edit Category UIOrganizer.title.addApplication=Add application to category @@ -47,6 +47,9 @@ UIOrganizer.msg.categoryNoExist=This category is no longer in database. UIOrganizer.msg.applicationNoExist=This application is no longer in database. +## org.exoplatform.applicationregistry.webui.component.UIApplicationRegistryEditMode +UIApplicationRegistryEditMode.title=Import Applications +UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo UIPermissionForm.label.UIListPermissionSelector= Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.xml 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.xml 2009-11-09 08:56:38 UTC (rev 524) @@ -63,7 +63,7 @@ <UIOrganizer> <label> <addCategory>Add Category</addCategory> - <autoImport>Auto Import</autoImport> + <autoImport>Import Applications</autoImport> <categories>Categories</categories> </label> <title> @@ -84,7 +84,18 @@ <applicationNoExist>This application is no longer in database.</applicationNoExist> </msg> </UIOrganizer> +  + <UIApplicationRegistryEditMode> + <title>Import Applications</title> + <label> + <showImport>Change Show Import</showImport> + </label> + </UIApplicationRegistryEditMode> + +  <UIPermissionForm> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2009-11-09 08:56:38 UTC (rev 524) @@ -31,7 +31,7 @@ ## org.exoplatform.applicationregistry.webui.component.UIApplicationOrganizer UIOrganizer.label.addCategory=Добавить категорию -UIOrganizer.label.autoImport=Автоматический импорт +UIOrganizer.label.autoImport=\u0418\u043C\u043F\u043E\u0440\u0442 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439 UIOrganizer.label.categories=Категории UIOrganizer.title.editCategory=Изменить категорию UIOrganizer.title.addApplication=Добавить приложение в категорию @@ -47,6 +47,10 @@ UIOrganizer.msg.categoryNoExist=Эта категория удалена из базы данных. UIOrganizer.msg.applicationNoExist=Это приложение удалено из базы данных. +## org.exoplatform.applicationregistry.webui.component.UIApplicationRegistryEditMode +UIApplicationRegistryEditMode.title=Import Applications +UIApplicationRegistryEditMode.label.showImport=Change Show Import + ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo UIPermissionForm.label.UIListPermissionSelector= Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties 2009-11-09 08:56:38 UTC (rev 524) @@ -31,7 +31,7 @@ ## org.exoplatform.applicationregistry.webui.component.UIApplicationOrganizer UIOrganizer.label.addCategory=Додати категорію -UIOrganizer.label.autoImport=Авто імпорт +UIOrganizer.label.autoImport=\u0406\u043C\u043F\u043E\u0440\u0442\u0443\u0439\u0442\u0435 \u0414\u043E\u0434\u0430\u0442\u043A\u0438 UIOrganizer.label.categories=Категорії UIOrganizer.title.editCategory=Редагувати категорію UIOrganizer.title.addApplication=Додати програму до категорії @@ -47,6 +47,10 @@ UIOrganizer.msg.categoryNoExist=Ця категорія не існує у базі даних. UIOrganizer.msg.applicationNoExist=Це застосування не існує у базі даних. +## org.exoplatform.applicationregistry.webui.component.UIApplicationRegistryEditMode +UIApplicationRegistryEditMode.title=Import Applications +UIApplicationRegistryEditMode.label.showImport=Change Show Import + ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo UIPermissionForm.label.UIListPermissionSelector= Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2009-11-09 08:56:38 UTC (rev 524) @@ -84,7 +84,18 @@ <applicationNoExist>Ứng dụng này không còn tồn tại trong cơ sở dữ liệu.</applicationNoExist> </msg> </UIOrganizer> +  + <UIApplicationRegistryEditMode> + <title>Import Applications</title> + <label> + <showImport>Change Show Import</showImport> + </label> + </UIApplicationRegistryEditMode> + +  <UIPermissionForm> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-09 08:56:38 UTC (rev 524) @@ -227,6 +227,10 @@ <mime-type>text/html</mime-type> <portlet-mode>help</portlet-mode> </supports> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>edit</portlet-mode> + </supports> <supported-locale>en</supported-locale> <resource-bundle>locale.portlet.exoadmin.ApplicationRegistryPortlet</resource-bundle> @@ -234,8 +238,8 @@ <title>Application Registry Portlet</title> <short-title>Registry</short-title> <keywords>Administration</keywords> - </portlet-info> - + </portlet-info> + <security-role-ref> <role-name>admin</role-name> <role-link>admin</role-link> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl 2009-11-09 08:56:38 UTC (rev 524) @@ -7,7 +7,9 @@ <div class="UIOrganizerManagement" id="$uicomponent.id"> <div class="UIControlbar"> <div class="IconControl AddCategoryIcon" onclick="<%= uicomponent.event("AddCategory") %>"><%=_ctx.appRes("UIOrganizer.label.addCategory")%></div> - <div class="IconControl ImportIcon" onclick="<%= uicomponent.event("ImportAllApplications") %>"><%=_ctx.appRes("UIOrganizer.label.autoImport")%></div> + <% if(uicomponent.isShowImport()) { %> + <div class="IconControl ImportIcon" onclick="<%= uicomponent.event("ImportAllApplications") %>"><%=_ctx.appRes("UIOrganizer.label.autoImport")%></div> + <% } %> <div class="ClearBoth"><span></span></div> </div> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl 2009-11-09 08:50:57 UTC (rev 523) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl 2009-11-09 08:56:38 UTC (rev 524) @@ -1,56 +1,70 @@ <% + import org.exoplatform.applicationregistry.webui.component.UIApplicationRegistryEditMode; + import javax.portlet.PortletMode ; + String cssClass; %> <div class="UIApplicationRegistryPortlet" id="$uicomponent.id"> - <div style="height:0px"><div style="width: 790px;" ><span style="display: none;"></span></div></div> - <div - style="!width: expression(this.previousSibling.offsetWidth - 22 + 'px'); min-width: 790px; padding: 10px;"> - <div class="UIToolbar"> - <div class="BlueLargeToolbar"> - <div class="ToolbarContainer"> - <div class="LeftToolbar"> - <div class="RightToolbar"> - <div class="MiddleToolbar"> - - <div class="ManagementIconContainer"> - <% - cssClass = "ItemButton"; - if(uicomponent.getChild(0).isRendered()) cssClass = "ItemButton SelectItemButton"; - %> - <div onclick="<%=uicomponent.event("ViewChild", "UIApplicationOrganizer")%>" class="$cssClass"> - <div class="LablelIcon OrganizeIcon"><span></span></div> - <a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.organize")%></a> + <%if( _ctx.getRequestContext().getApplicationMode() == PortletMode.VIEW) {%> + <div style="height:0px"><div style="width: 790px;" ><span style="display: none;"></span></div></div> + <div + style="!width: expression(this.previousSibling.offsetWidth - 22 + 'px'); min-width: 790px; padding: 10px;"> + <div class="UIToolbar"> + <div class="BlueLargeToolbar"> + <div class="ToolbarContainer"> + <div class="LeftToolbar"> + <div class="RightToolbar"> + <div class="MiddleToolbar"> + + <div class="ManagementIconContainer"> + <% + cssClass = "ItemButton"; + if(uicomponent.getChild(0).isRendered()) cssClass = "ItemButton SelectItemButton"; + %> + <div onclick="<%=uicomponent.event("ViewChild", "UIApplicationOrganizer")%>" class="$cssClass"> + <div class="LablelIcon OrganizeIcon"><span></span></div> + <a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.organize")%></a> + </div> + <div class="HorizontalSeparator"><span></span></div> + <% + cssClass = "ItemButton"; + if(uicomponent.getChild(1).isRendered()) cssClass = "ItemButton SelectItemButton"; + %> + <div onclick="<%=uicomponent.event("ViewChild", "UIPortletManagement")%>" class="$cssClass"> + <div class="LablelIcon PorletIcon"><span></span></div> + <a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.portlet")%></a> + </div> + <div class="HorizontalSeparator"><span></span></div> + <% + cssClass = "ItemButton"; + if(uicomponent.getChild(2).isRendered()) cssClass = "ItemButton SelectItemButton"; + %> + <div onclick="<%=uicomponent.event("ViewChild", "UIGadgetManagement")%>" class="$cssClass"> + <div class="LablelIcon GadgetIcon"><span></span></div> + <a href="javascript:void(0)" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.gadget")%></a> + </div> + <div class="ClearLeft"><span></span></div> </div> - <div class="HorizontalSeparator"><span></span></div> - <% - cssClass = "ItemButton"; - if(uicomponent.getChild(1).isRendered()) cssClass = "ItemButton SelectItemButton"; - %> - <div onclick="<%=uicomponent.event("ViewChild", "UIPortletManagement")%>" class="$cssClass"> - <div class="LablelIcon PorletIcon"><span></span></div> - <a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.portlet")%></a> - </div> - <div class="HorizontalSeparator"><span></span></div> - <% - cssClass = "ItemButton"; - if(uicomponent.getChild(2).isRendered()) cssClass = "ItemButton SelectItemButton"; - %> - <div onclick="<%=uicomponent.event("ViewChild", "UIGadgetManagement")%>" class="$cssClass"> - <div class="LablelIcon GadgetIcon"><span></span></div> - <a href="javascript:void(0)" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.gadget")%></a> - </div> - <div class="ClearLeft"><span></span></div> + </div> - </div> </div> </div> </div> </div> + + <div class="PortletContainer"> + <% + uicomponent.renderChildren(); + %> </div> - - <div class="PortletContainer"> - <%uicomponent.renderChildren();%> - </div> - </div> + </div> + <%} else { + for(inputEntry in uicomponent.getChildren()) { + if (inputEntry instanceof UIApplicationRegistryEditMode) { + uicomponent.renderUIComponent(inputEntry); + } + } + } + %> </div> \ No newline at end of file

15 years, 1 month

1
0
0 / 0

gatein SVN: r523 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/navigation and 1 other directories.

by do-not-reply＠jboss.org

Author: truong.le Date: 2009-11-09 03:50:57 -0500 (Mon, 09 Nov 2009) New Revision: 523 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 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/workspace/UIMainActionListener.java Log: GTNPORTAL-163: Show message wrong when user doesn't not have right to edit portal Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-09 08:50:57 UTC (rev 523) @@ -1266,7 +1266,8 @@ </UIAdvancedCustomization> <UIPortalManagement> <msg> - <Invalid-editPermission>!ليس لديك الحق في تحرير البوابة</Invalid-editPermission> + <Invalid-EditPage-Permission>\u0644\u0627 \u064A\u0648\u062C\u062F \u0644\u062F\u064A\u0643 \u0627\u0644\u062D\u0642 \u0641\u064A \u062A\u0639\u062F\u064A\u0644 \u0647\u0630\u0647 \u0627\u0644\u0635\u0641\u062D\u0629</Invalid-EditPage-Permission> + <Invalid-EditLayout-Permission>\u0644\u0627 \u064A\u0648\u062C\u062F \u0644\u062F\u064A\u0643 \u0627\u0644\u062D\u0642 \u0641\u064A \u062A\u062D\u0631\u064A\u0631 \u0647\u0630\u0627 \u0627\u0644\u062A\u0635\u0645\u064A\u0645</Invalid-EditLayout-Permission> </msg> <title> <EDIT>تعديل البوابة الحالية</EDIT> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -726,7 +726,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Page UIAdvancedCustomization.label.UIPortalManagement=Portal Management UIAdvancedCustomization.label.UIPageManagement=Page Management -UIPortalManagement.msg.Invalid-editPermission=You don't have the permission to edit this portal. +UIPortalManagement.msg.Invalid-EditLayout-Permission=You have no right to edit this layout. +UIPortalManagement.msg.Invalid-EditPage-Permission=You have no right to edit this page. UIPortalManagement.title.EDIT=Edit current Portal UIPortalManagement.title.BROWSE=Manage Portals Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -702,7 +702,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Page UIAdvancedCustomization.label.UIPortalManagement=Gestion de portail UIAdvancedCustomization.label.UIPageManagement=Gestion de page -UIPortalManagement.msg.Invalid-editPermission=Vous n'avez pas les droits suffisants pour éditer le portail ! +UIPortalManagement.msg.Invalid-EditLayout-Permission=Vous n'avez pas le droit de modifier cette disposition. +UIPortalManagement.msg.Invalid-EditPage-Permission=Vous n'avez pas le droit de modifier cette page. UIPortalManagement.title.EDIT=Editer le portail en cours UIPortalManagement.title.BROWSE=Parcourir les portails existants Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -716,7 +716,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Страница UIAdvancedCustomization.label.UIPortalManagement=Управление порталом UIAdvancedCustomization.label.UIPageManagement=Управление страницами -UIPortalManagement.msg.Invalid-editPermission=У Вас нету прав для редактирования этого портала. +UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u043D\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043C\u0430\u043A\u0435\u0442\u0430. +UIPortalManagement.msg.Invalid-EditPage-Permission=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443. UIPortalManagement.title.EDIT=Изменить портал UIPortalManagement.title.BROWSE=Управление порталами Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -707,7 +707,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Сторінка UIAdvancedCustomization.label.UIPortalManagement=Управління порталом UIAdvancedCustomization.label.UIPageManagement=Управління сторінкою -UIPortalManagement.msg.Invalid-editPermission=У Вас немає прав, щоб редагувати цей портал. +UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0412\u0438 \u043D\u0435 \u043C\u0430\u0454\u0442\u0435 \u043D\u0456\u044F\u043A\u043E\u0433\u043E \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0446\u0435 \u0440\u043E\u0437\u0442\u0430\u0448\u0443\u0432\u0430\u043D\u043D\u044F. +UIPortalManagement.msg.Invalid-EditPage-Permission=\u0412\u0438 \u043D\u0435 \u043C\u0430\u0454\u0442\u0435 \u0436\u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0446\u044E \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0443. UIPortalManagement.title.EDIT=Редагувати поточний портал UIPortalManagement.title.BROWSE=Управління порталами Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -707,7 +707,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Trang UIAdvancedCustomization.label.UIPortalManagement=Quản lý Portal UIAdvancedCustomization.label.UIPageManagement=Quản lý trang -UIPortalManagement.msg.Invalid-editPermission=Bạn không được phân quyền để chỉnh sửa Portal này! +UIPortalManagement.msg.Invalid-EditLayout-Permission=B\u1EA1n kh\u00F4ng c\u00F3 quy\u1EC1n ch\u1EC9nh s\u1EEDa layout. +UIPortalManagement.msg.Invalid-EditPage-Permission=B\u1EA1n kh\u00F4ng c\u00F3 quy\u1EC1n ch\u1EC9nh s\u1EEDa trang n\u00E0y. UIPortalManagement.title.EDIT=Chỉnh sửa Portal hiện tại UIPortalManagement.title.BROWSE=Khảo sát các Portal 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 07:57:01 UTC (rev 522) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-09 08:50:57 UTC (rev 523) @@ -415,6 +415,7 @@ portalComposer.setShowControl(true); portalComposer.setEditted(false); portalComposer.setCollapse(false); + portalComposer.setId("UIPageEditor"); portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor"); UIPortalToolPanel uiToolPanel = Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2009-11-09 08:50:57 UTC (rev 523) @@ -66,7 +66,7 @@ UserACL userACL = uiApp.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(page)) { - uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-editPermission", null)); + uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-EditPage-Permission", null)); return; } @@ -127,7 +127,7 @@ UserACL userACL = uiPortal.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(portalConfig)) { - uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-editPermission", + uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-EditLayout-Permission", new String[]{uiPortal.getName()})); return; }

15 years, 1 month

1
0
0 / 0

gatein SVN: r522 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/navigation and 1 other directory.

by do-not-reply＠jboss.org

Author: tam_nguyen Date: 2009-11-09 02:57:01 -0500 (Mon, 09 Nov 2009) New Revision: 522 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl Log: GTNPORTAL-82 Should show message when user does not have the right to add navigation ( Mary/Demo) Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-09 06:33:51 UTC (rev 521) +++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-09 07:57:01 UTC (rev 522) @@ -115,6 +115,14 @@ .UIPageNavigationForm { margin: 20px auto; +} + +.UIAddGroupNavigation .WarningAddGroup { + text-align: center; + padding: 15px 0px; + background: #FED8D8; + margin: 10px; + font-size: 13px; } /********************UINavigationManagement****************/ Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl 2009-11-09 06:33:51 UTC (rev 521) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl 2009-11-09 07:57:01 UTC (rev 522) @@ -8,7 +8,9 @@ %> <div id="$uicomponent.id" class="FeedBox"> <% if (listGroupNames.size() == 0){ %> + <div class="WarningAddGroup"> <%=_ctx.appRes("UIAddGroupNavigation.Label.NoPermission")%> + </div> <% } %> <% for(groupName in listGroupNames) {

15 years, 1 month

1
0
0 / 0

gatein SVN: r521 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2009-11-09 01:33:51 -0500 (Mon, 09 Nov 2009) New Revision: 521 Removed: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageWelcome.gtmpl Log: GTNPORTAL-29: Remove descriptive step from page creation wizard Deleted: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageWelcome.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageWelcome.gtmpl 2009-11-09 06:30:49 UTC (rev 520) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageWelcome.gtmpl 2009-11-09 06:33:51 UTC (rev 521) @@ -1,5 +0,0 @@ -<div class="UIWizardWelcome"> - <div class="WelcomeText"><b><%=_ctx.appRes("UIWizardWelcome.WelcomeLabel")%></b> - <br/><%=_ctx.appRes("UIWizardWelcome.WelcomeText")%> - </div> -</div>

15 years, 1 month

1
0
0 / 0

gatein SVN: r520 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directory.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2009-11-09 01:30:49 -0500 (Mon, 09 Nov 2009) New Revision: 520 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java Log: GTNPORTAL-29: Remove descriptive step from page creation wizard Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-09 04:21:23 UTC (rev 519) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-09 06:30:49 UTC (rev 520) @@ -1063,13 +1063,6 @@ UIFormUploadInput.msg.limit=The file must be less than {0} MB. ############################################################################### - # org.exoplatform.portal.webui.component.UIWizardWelcome # - ############################################################################### - -UIWizardWelcome.WelcomeLabel=Welcome to the Page Creation Wizard . -UIWizardWelcome.WelcomeText=This Wizard will guide you through the creation of a new page. When you have finished entering the required information, you will be asked to save. Click on the "Back" and "Next" buttons or select a step number in order to navigate between the steps. - - ############################################################################### # org.exoplatform.portal.webui.component.customization.UIPageNodeSelector # ############################################################################### Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-09 04:21:23 UTC (rev 519) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-09 06:30:49 UTC (rev 520) @@ -1047,12 +1047,6 @@ UIFormUploadInput.label.Cancel=#{word.cancel} UIFormUploadInput.msg.limit=The file must be less than {0} MB. - ############################################################################### - # org.exoplatform.portal.webui.component.UIWizardWelcome # - ############################################################################### - -UIWizardWelcome.WelcomeLabel=Bienvenue dans l'assistant de création de page ! -UIWizardWelcome.WelcomeText=Cet assistant vous accompagnera dans le processus de création d'une nouvelle page de portail. Il vous guidera dans la saisie des différentes informations nécessaires pour créer cette page. Une fois l'ensemble des informations saisies, vous serez invité à sauver votre nouvelle page. Il est très facile, en cliquant sur les boutons « Précédent » et « Suivant » ou sur le numéro d'une étape particulière, de se déplacer dans les différentes étapes. ############################################################################### # org.exoplatform.portal.webui.component.customization.UIPageNodeSelector # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-09 04:21:23 UTC (rev 519) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-09 06:30:49 UTC (rev 520) @@ -1052,12 +1052,6 @@ UIFormUploadInput.label.Cancel=Отменить UIFormUploadInput.msg.limit=Максимальный размер файла {0} MiB. - ############################################################################### - # org.exoplatform.portal.webui.component.UIWizardWelcome # - ############################################################################### - -UIWizardWelcome.WelcomeLabel=Добро пожаловать в мастер создания страниц. -UIWizardWelcome.WelcomeText=С помощью этого мастера Вы сможете создать новую страницу. После заполнения необходимых полей вы сможете сохранить страницу. Перейдите далее или нажмите "назад", что б вернуться к предыдущему шагу. ############################################################################### # org.exoplatform.portal.webui.component.customization.UIPageNodeSelector # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-09 04:21:23 UTC (rev 519) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-09 06:30:49 UTC (rev 520) @@ -1043,12 +1043,6 @@ UIFormUploadInput.label.Cancel=Скасувати UIFormUploadInput.msg.limit=Файл повинен бути меншим, ніж {0} MB. - ############################################################################### - # org.exoplatform.portal.webui.component.UIWizardWelcome # - ############################################################################### - -UIWizardWelcome.WelcomeLabel=Вітаємо у eXo Wizard-створювачі сторінок. -UIWizardWelcome.WelcomeText=Wizard покроково допоможе створити нову сторінку. Коли ви закінчите вводити всю необхідну інформацію, будь ласка, потім збережіть її. Натисніть на кнопку "Далі" або "Назад", або виберіть номер кроку. ############################################################################### # org.exoplatform.portal.webui.component.customization.UIPageNodeSelector # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-09 04:21:23 UTC (rev 519) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-09 06:30:49 UTC (rev 520) @@ -1042,13 +1042,6 @@ UIFormUploadInput.msg.limit=Dung lượng tệp tin không được lớn hơn {0} MB. ############################################################################### - # org.exoplatform.portal.webui.component.UIWizardWelcome # - ############################################################################### - -UIWizardWelcome.WelcomeLabel=Chào mừng bạn đến với eXo Page Creation Wizard ! -UIWizardWelcome.WelcomeText=Wizard này sẽ giúp bạn tạo một trang mới qua những bước đơn giản, bạn chỉ cần nhập những thông tin cần thiết cho trang của bạn rồi tự sắp xếp trang theo ý muốn của bạn. Khi bạn hoàn thành việc đó chỉ cần nhấp chuột để lưu lại những gì bạn đã tạo. Và, nó thực sự dễ dàng để chuyển hướng các bước bằng việc nhấp lên nút "Trở lại" and "Tiếp theo" hay nhấp chuột lên số của các bước của Wizard. - - ############################################################################### # org.exoplatform.portal.webui.component.customization.UIPageNodeSelector # ############################################################################### 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 04:21:23 UTC (rev 519) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-09 06:30:49 UTC (rev 520) @@ -55,26 +55,31 @@ * 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), - @EventConfig(listeners = UIPageCreationWizard.ViewStep3ActionListener.class), - @EventConfig(listeners = UIPageCreationWizard.ViewStep4ActionListener.class), - @EventConfig(listeners = UIPageCreationWizard.ViewStep5ActionListener.class), - @EventConfig(listeners = UIPageWizard.AbortActionListener.class)}), - @ComponentConfig(id = "ViewStep1", type = UIContainer.class, template = "system:/groovy/portal/webui/page/UIWizardPageWelcome.gtmpl")}) +@ComponentConfigs(@ComponentConfig(template = "system:/groovy/webui/core/UIWizard.gtmpl", events = { + @EventConfig(listeners = UIPageCreationWizard.ViewStep1ActionListener.class), + @EventConfig(listeners = UIPageCreationWizard.ViewStep2ActionListener.class), + @EventConfig(listeners = UIPageCreationWizard.ViewStep3ActionListener.class), + @EventConfig(listeners = UIPageCreationWizard.ViewStep4ActionListener.class), + @EventConfig(listeners = UIPageWizard.AbortActionListener.class)})) public class UIPageCreationWizard extends UIPageWizard { + final public static int FIRST_STEP = 1; + + final public static int SECONDE_STEP = 2; + + final public static int THIRD_STEP = 3; + + final public static int NUMBER_OF_STEPs = 3; + public UIPageCreationWizard() throws Exception { - addChild(UIContainer.class, "ViewStep1", null); addChild(UIWizardPageSetInfo.class, null, null).setRendered(false); addChild(UIWizardPageSelectLayoutForm.class, null, null).setRendered(false); addChild(UIPagePreview.class, null, null).setRendered(false); - setNumberSteps(4); - setShowWelcomeComponent(true); + setNumberSteps(NUMBER_OF_STEPs); + viewStep(FIRST_STEP); + setShowWelcomeComponent(false); } private void saveData() throws Exception @@ -165,36 +170,22 @@ return false; } - // TODO: Review this listener after remove UIExoStart - static public class ViewStep1ActionListener extends EventListener<UIPageCreationWizard> + static public class ViewStep1ActionListener extends EventListener<UIPageWizard> { - public void execute(Event<UIPageCreationWizard> event) throws Exception - { - UIPageCreationWizard uiWizard = event.getSource(); - uiWizard.setDescriptionWizard(1); - uiWizard.updateWizardComponent(); - uiWizard.viewStep(1); - UIWorkingWorkspace uiWorkingWS = uiWizard.getAncestorOfType(UIWorkingWorkspace.class); - uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false); - } - } - - static public class ViewStep2ActionListener extends EventListener<UIPageWizard> - { public void execute(Event<UIPageWizard> event) throws Exception { UIPageWizard uiWizard = event.getSource(); - uiWizard.setDescriptionWizard(2); + uiWizard.setDescriptionWizard(FIRST_STEP); uiWizard.updateWizardComponent(); - uiWizard.viewStep(2); + uiWizard.viewStep(FIRST_STEP); UIWorkingWorkspace uiWorkingWS = uiWizard.getAncestorOfType(UIWorkingWorkspace.class); uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false); } } - static public class ViewStep3ActionListener extends EventListener<UIPageCreationWizard> + static public class ViewStep2ActionListener extends EventListener<UIPageCreationWizard> { public void execute(Event<UIPageCreationWizard> event) throws Exception { @@ -202,13 +193,13 @@ UIPortalApplication uiPortalApp = uiWizard.getAncestorOfType(UIPortalApplication.class); UIWorkingWorkspace uiWorkingWS = uiWizard.getAncestorOfType(UIWorkingWorkspace.class); uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false); - uiWizard.viewStep(3); + uiWizard.viewStep(SECONDE_STEP); - if (uiWizard.getSelectedStep() < 3) + if (uiWizard.getSelectedStep() < SECONDE_STEP) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.StepByStep", null)); - uiWizard.setDescriptionWizard(2); - uiWizard.viewStep(2); + uiWizard.setDescriptionWizard(FIRST_STEP); + uiWizard.viewStep(FIRST_STEP); uiWizard.updateWizardComponent(); return; } @@ -216,21 +207,21 @@ if (uiWizard.isSelectedNodeExist()) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null)); - uiWizard.viewStep(2); + uiWizard.viewStep(FIRST_STEP); uiWizard.updateWizardComponent(); return; } UIWizardPageSetInfo uiPageSetInfo = uiWizard.getChild(UIWizardPageSetInfo.class); UIPageNodeSelector uiNodeSelector = uiPageSetInfo.getChild(UIPageNodeSelector.class); - uiWizard.setDescriptionWizard(3); + uiWizard.setDescriptionWizard(SECONDE_STEP); uiWizard.updateWizardComponent(); PageNavigation navigation = uiNodeSelector.getSelectedNavigation(); if (navigation == null) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.notSelectedPageNavigation", new String[]{}));; - uiWizard.viewStep(2); + uiWizard.viewStep(FIRST_STEP); return; } @@ -245,7 +236,7 @@ if (startDate.after(endDate)) { uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", null)); - uiWizard.viewStep(2); + uiWizard.viewStep(FIRST_STEP); return; } } @@ -253,7 +244,7 @@ } } - static public class ViewStep4ActionListener extends EventListener<UIPageCreationWizard> + static public class ViewStep3ActionListener extends EventListener<UIPageCreationWizard> { private void setDefaultPermission(Page page, String ownerType, String ownerId) @@ -280,14 +271,14 @@ if (uiWizard.isSelectedNodeExist()) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null)); - uiWizard.setDescriptionWizard(2); - uiWizard.viewStep(2); + uiWizard.setDescriptionWizard(FIRST_STEP); + uiWizard.viewStep(FIRST_STEP); uiWizard.updateWizardComponent(); return; } - uiWizard.viewStep(4); + uiWizard.viewStep(THIRD_STEP); - if (uiWizard.getSelectedStep() < 4) + if (uiWizard.getSelectedStep() < THIRD_STEP) { uiWizard.setDescriptionWizard(uiWizard.getSelectedStep()); uiWizard.updateWizardComponent(); @@ -314,13 +305,13 @@ if (storage.getPage(pageId) != null) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null)); - uiWizard.setDescriptionWizard(2); - uiWizard.viewStep(2); + uiWizard.setDescriptionWizard(FIRST_STEP); + uiWizard.viewStep(FIRST_STEP); uiWizard.updateWizardComponent(); } page.setModifiable(true); - //Set default permissions on the page + // Set default permissions on the page setDefaultPermission(page, ownerType, ownerId); if (page.getTitle() == null || page.getTitle().trim().length() == 0) @@ -356,7 +347,7 @@ } } - static public class ViewStep5ActionListener extends EventListener<UIPageCreationWizard> + static public class ViewStep4ActionListener extends EventListener<UIPageCreationWizard> { public void execute(Event<UIPageCreationWizard> event) throws Exception { @@ -367,8 +358,8 @@ if (uiWizard.isSelectedNodeExist()) { uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null)); - uiWizard.setDescriptionWizard(2); - uiWizard.viewStep(2); + uiWizard.setDescriptionWizard(FIRST_STEP); + uiWizard.viewStep(FIRST_STEP); uiWizard.updateWizardComponent(); return; }

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2009