[gatein-pull-requests] [gatein/gatein-portal] 15f589: GTNPORTAL-2751: <priority> in navigation.xml files...
Branch: refs/heads/master
Home: https://github.com/gatein/gatein-portal
Commit: 15f5899471161ac5ced8a26e60807bfe491d4696
https://github.com/gatein/gatein-portal/commit/15f5899471161ac5ced8a26e60...
Author: haint <haithanh0809(a)gmail.com>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M component/portal/src/main/java/gatein_objects_1_6.xsd
M
component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
M
component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java
M
component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/NavigationMarshaller.java
M component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java
M component/portal/src/main/resources/binding.xml
M component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
M
component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
M
component/portal/src/test/java/org/exoplatform/portal/mop/importer/TestNavigationImporter.java
M
component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/NavigationMarshallerTest.java
M component/portal/src/test/java/org/exoplatform/portal/mop/user/TestUserPortal.java
M
component/portal/src/test/resources/org/exoplatform/portal/mop/management/navigation-empty.xml
M
component/portal/src/test/resources/org/exoplatform/portal/mop/user/group/organization/management/executive-board/navigation.xml
M
component/portal/src/test/resources/org/exoplatform/portal/mop/user/group/platform/users/navigation.xml
M web/portal/src/main/resources/locale/portal/webui_en.properties
M
webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
Log Message:
-----------
GTNPORTAL-2751: <priority> in navigation.xml files ignored for merge importMode