[gatein-pull-requests] [gatein/gatein-portal] c2bd5c: GTNPORTAL-2529:

Branch: refs/heads/master Home: https://github.com/gatein/gatein-portal Commit: c2bd5c98f5150e13562f586ab8863c056bd7e73b https://github.com/gatein/gatein-portal/commit/c2bd5c98f5150e13562f586ab8... Author: Matt Wringe <mwringe(a)gmail.com&gt; Date: 2012-08-07 (Tue, 07 Aug 2012) Changed paths: M component/portal/src/main/java/conf/gatein-nodetypes.xml M component/portal/src/main/java/org/exoplatform/portal/config/model/RedirectCondition.java M component/portal/src/main/java/org/exoplatform/portal/mop/redirects/DeviceProperty.java M web/redirect/src/test/java/org/gatein/web/redirect/TestConfig.java M web/redirect/src/test/java/org/gatein/web/redirect/TestMapper.java A web/redirect/src/test/java/org/gatein/web/redirect/TestRedirect.java A web/redirect/src/test/resources/org/exoplatform/portal/config/TestRedirects-configuration.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/origin/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/origin/pages.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/origin/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectA/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectA/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectB/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectB/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectC/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectC/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectD/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectD/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectE/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectE/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectF/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectF/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectG/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectG/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectH/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectH/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectI/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectI/portal.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectJ/navigation.xml R web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectJ/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/origin/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/origin/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/origin/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectA/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectA/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectB/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectB/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectC/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectC/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectD/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectD/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectE/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectE/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectF/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectF/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectG/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectG/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectH/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectH/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectI/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectI/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectJ/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testMappings-conf/portal/redirectJ/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/devicePropertyRedirect/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/devicePropertyRedirect/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/devicePropertyRedirect/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/emptyConditions/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/emptyConditions/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/emptyConditions/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/noRedirects/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/noRedirects/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/noRedirects/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleDevicePropertyRedirect/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleDevicePropertyRedirect/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleDevicePropertyRedirect/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleUserAgentRedirect/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleUserAgentRedirect/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleUserAgentRedirect/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleUserAgentRedirectDisabled/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleUserAgentRedirectDisabled/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/simpleUserAgentRedirectDisabled/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirect/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirect/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirect/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirectAll/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirectAll/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirectAll/portal.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirectAllDisabled/navigation.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirectAllDisabled/pages.xml A web/redirect/src/test/resources/org/exoplatform/portal/config/testRedirects-conf/portal/userAgentRedirectAllDisabled/portal.xml Log Message: ----------- GTNPORTAL-2529: - Fix issue where device properties are not loaded from the portal.xml configuration file. Without this fix, the device properties are just ignored - Fixes issues where greater-than and less-than device property values are not loaded into chromattic properly and causing class cast exception when used. - Updated tests to better test the device detection using the portal.xml file