Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
GTNPORTAL-3178: update so that disabled redirects are not displayed in the redirect portlets as options.

  1. … 1 more file in changeset.
Remove what we redo

  1. … 2904 more files in changeset.
GTNPORTAL-2916: update the redirect service to also accept nodes string representations which start with a "/".

  1. … 4 more files in changeset.
Decouple the NavigationService from jcr and move it to org.gatein.portal.mop.navigation package

  1. … 232 more files in changeset.
Merge branch 'master' into mobile

Conflicts:

component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java

mobile-integration/extension-configuration/src/main/webapp/WEB-INF/conf/portal/portal/mobile/pages.xml

mobile-integration/extension-configuration/src/main/webapp/WEB-INF/conf/portal/portal/template/portal/mobile/portal.xml

packaging/jboss-as7/pkg/package.xml

packaging/jboss-as7/pkg/pom.xml

packaging/jboss-as7/pkg/src/main/resources/jboss/main/gatein/gatein.ear/META-INF/application.xml

packaging/jetty/pkg/pom.xml

packaging/tomcat/pkg/pom.xml

pom.xml

portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java

web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml

web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml

web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml

web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml

web/redirect/src/main/java/org/gatein/web/redirect/implementation/SiteRedirectServiceImpl.java

    • -142
    • +103
    ./SiteRedirectServiceImpl.java
  1. … 16 more files in changeset.
GTNPORTAL-2781: fixes an issue which caused an NPE to be logged.

  1. … 1 more file in changeset.
GTNPORTAL-2730 New code style rules and build level formatting enforcement

    • -143
    • +104
    ./SiteRedirectServiceImpl.java
  1. … 2297 more files in changeset.
GTNPORTAL-2685: Update the RedirectRequestHandler to let the WebAppController handle the RequestLifeCycle.

  1. … 3 more files in changeset.
GTNPORTAL-2403: Create site preference portlet - created portlet which will allow users to select which site they perfer. Performs redirects based on the mappings specified in the portal.xml - added to the other servers build, but currently only works with JBossAS5 (issues with the Portlet Bridge and server compatibilities). May need to drop using JSF and create a normal portlet due to this :(

    • -0
    • +96
    ./RedirectHandlerImpl.java
    • -201
    • +0
    ./DeviceRedirectServiceImpl.java
  1. … 36 more files in changeset.
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

    • -0
    • +201
    ./DeviceRedirectServiceImpl.java
  1. … 86 more files in changeset.