2:08 a.m.
Branch: refs/heads/master
Home: https://github.com/gatein/gatein-portal
Commit: 82796211ba951bb47d197ed1214f45337f14061b
https://github.com/gatein/gatein-portal/commit/82796211ba951bb47d197ed121...
Author: Matt Wringe <mwringe(a)gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M component/portal/src/main/java/conf/gatein-nodetypes.xml
M
component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
A
component/portal/src/main/java/org/exoplatform/portal/config/model/DevicePropertyCondition.java
A component/portal/src/main/java/org/exoplatform/portal/config/model/NodeMap.java
M
component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java
A
component/portal/src/main/java/org/exoplatform/portal/config/model/PortalRedirect.java
A
component/portal/src/main/java/org/exoplatform/portal/config/model/RedirectCondition.java
A
component/portal/src/main/java/org/exoplatform/portal/config/model/RedirectMappings.java
A
component/portal/src/main/java/org/exoplatform/portal/config/model/UserAgentConditions.java
A component/portal/src/main/java/org/exoplatform/portal/mop/redirects/Condition.java
A
component/portal/src/main/java/org/exoplatform/portal/mop/redirects/DeviceProperty.java
A component/portal/src/main/java/org/exoplatform/portal/mop/redirects/Mappings.java
A component/portal/src/main/java/org/exoplatform/portal/mop/redirects/NodeMap.java
A component/portal/src/main/java/org/exoplatform/portal/mop/redirects/Redirect.java
A
component/portal/src/main/java/org/exoplatform/portal/mop/redirects/Redirectable.java
M component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
M component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
M component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
A
component/portal/src/main/java/org/exoplatform/portal/pom/data/RedirectConditionData.java
A component/portal/src/main/java/org/exoplatform/portal/pom/data/RedirectData.java
A
component/portal/src/main/java/org/exoplatform/portal/pom/data/RedirectDevicePropertyConditionData.java
A
component/portal/src/main/java/org/exoplatform/portal/pom/data/RedirectMappingsData.java
A
component/portal/src/main/java/org/exoplatform/portal/pom/data/RedirectUserAgentConditionData.java
M component/portal/src/main/resources/binding.xml
M component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java
M
component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/SiteLayoutMarshallerTest.java
M
component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml
M packaging/common/src/main/resources/controller.xml
M packaging/jboss-as5/pkg/pom.xml
M packaging/jboss-as6/pkg/pom.xml
M packaging/jboss-as7/modules/build.xml
M packaging/jboss-as7/modules/pom.xml
M packaging/jetty/pkg/pom.xml
M packaging/tomcat/pkg/pom.xml
M pom.xml
M web/pom.xml
M web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/portal/controller-configuration.xml
A web/portal/src/main/webapp/WEB-INF/conf/portal/device-configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
A web/portal/src/main/webapp/WEB-INF/conf/portal/portal/mobile/navigation.xml
A web/portal/src/main/webapp/WEB-INF/conf/portal/portal/mobile/pages.xml
A web/portal/src/main/webapp/WEB-INF/conf/portal/portal/mobile/portal.xml
A web/portal/src/main/webapp/device/detection.jsp
A web/portal/src/main/webapp/device/loading.gif
A web/redirect/pom.xml
A
web/redirect/src/main/java/org/gatein/web/redirect/DeviceRedirectRequestHandler.java
A web/redirect/src/main/java/org/gatein/web/redirect/Mapper.java
A web/redirect/src/main/java/org/gatein/web/redirect/RedirectCookie.java
A web/redirect/src/main/java/org/gatein/web/redirect/Redirector.java
A web/redirect/src/main/java/org/gatein/web/redirect/api/DeviceRedirectService.java
A web/redirect/src/main/java/org/gatein/web/redirect/api/RedirectKey.java
A web/redirect/src/main/java/org/gatein/web/redirect/api/RedirectType.java
A
web/redirect/src/main/java/org/gatein/web/redirect/implementation/DeviceRedirectServiceImpl.java
A web/redirect/src/test/java/org/gatein/web/redirect/PortalRedirectsFactory.java
A web/redirect/src/test/java/org/gatein/web/redirect/TestConfig.java
A web/redirect/src/test/java/org/gatein/web/redirect/TestMapper.java
A web/redirect/src/test/java/org/gatein/web/redirect/TestRedirector.java
A web/redirect/src/test/resources/conf/exo.portal.component.portal-configuration.xml
A web/redirect/src/test/resources/conf/test-mop-nodetypes.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/TestMappings-configuration.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/origin/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/origin/pages.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/origin/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectA/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectA/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectB/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectB/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectC/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectC/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectD/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectD/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectE/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectE/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectF/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectF/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectG/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectG/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectH/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectH/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectI/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectI/portal.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectJ/navigation.xml
A
web/redirect/src/test/resources/org/exoplatform/portal/config/siteOrigin-conf/portal/redirectJ/portal.xml
M webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
M webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java
Log Message:
-----------
GTNPORTAL-2490 - Initial work on device detection and redirection work.
- redirection is loaded from the portal.xml conf file
- redirection configuration is stored in the jcr
- redirection service added along with a default 'mobile' site for use
when a mobile browser accesses the page