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 @@ +<!-- + + 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. + +--> + +<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> - <!--propertyDefinition name="data" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition--> - </propertyDefinitions> - </nodeType> - + <nodeType name="exo:gadget" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:unstructured</supertype> + </supertypes> + <propertyDefinitions> + <!--propertyDefinition name="data" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition--> + </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 @@ +<!-- + + 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. + +--> + +<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.png" - 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.png" + 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... 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... 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">Register Portlet</description> - <portlet-name>RegisterPortlet</portlet-name> - <display-name xml:lang="EN">Register 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/RegisterPortlet/webui/configuration.xml</value> - </init-param> + <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> - <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.RegisterPortlet</resource-bundle> - <portlet-info> - <title>Register Portlet</title> - <short-title>Register 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> + <!-- + <portlet> + <description xml:lang="EN">Register Portlet</description> + <portlet-name>RegisterPortlet</portlet-name> + <display-name xml:lang="EN">Register 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.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> + <init-param> + <name>webui.configuration</name> + <value>/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/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</supported-locale> - <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> + <resource-bundle>locale.portlet.exoadmin.RegisterPortlet</resource-bundle> + <portlet-info> + <title>Register Portlet</title> + <short-title>Register 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.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