[gatein-pull-requests] [gatein/gatein-portal] 308ddd: GTNPORTAL-3358: Add redirect admin ui icons files ...

Branch: refs/heads/3.6.x Home: https://github.com/gatein/gatein-portal Commit: 308ddd279b73663961d2e934231c4f7983932031 https://github.com/gatein/gatein-portal/commit/308ddd279b73663961d2e93423... Author: Alexandre Mendonça <ammendonca(a)gmail.com&gt; Date: 2014-01-15 (Wed, 15 Jan 2014) Changed paths: M portlet/admin/redirect/src/main/webapp/resources/img/rcue-icons-gray.png M portlet/admin/redirect/src/main/webapp/resources/img/rcue-icons-white.png M portlet/admin/redirect/src/main/webapp/resources/img/rcue-icons.png Log Message: ----------- GTNPORTAL-3358: Add redirect admin ui icons files with warning sign included. Commit: 8c57d30bfd278d1479191d9ef9e4d32da8e4f96e https://github.com/gatein/gatein-portal/commit/8c57d30bfd278d1479191d9ef9... Author: Juraci Paixão Kröhling <juraci(a)kroehling.de&gt; Date: 2014-01-15 (Wed, 15 Jan 2014) Changed paths: M wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java Log Message: ----------- GTNPORTAL-3359 - Supressed WSRP-related exceptions on shutdown Supressed the exception thrown in case something goes wrong while shutting down the consumers, as we cannot guarantee that the stop routine for WSRP will be called before the stop routine for the JCR connection manager. The proper solution would be to find a way to hook into the JCR shutdown and stop it before the JCR connection manager shuts down, but there doesn't seems to be a way to do it. Compare: https://github.com/gatein/gatein-portal/compare/2c0bea617ab8...8c57d30bfd27