Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1A427200C70 for ; Wed, 19 Apr 2017 18:35:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 18D00160B94; Wed, 19 Apr 2017 16:35:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 389ED160B9C for ; Wed, 19 Apr 2017 18:35:54 +0200 (CEST) Received: (qmail 42509 invoked by uid 500); 19 Apr 2017 16:35:53 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 42491 invoked by uid 99); 19 Apr 2017 16:35:52 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Apr 2017 16:35:52 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 08A9E3A002A for ; Wed, 19 Apr 2017 16:35:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1791939 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed: administration/ healthcheck/validators/ pipeline/valve/ Date: Wed, 19 Apr 2017 16:35:51 -0000 To: jetspeed-dev@portals.apache.org From: taylor@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170419163552.08A9E3A002A@svn01-us-west.apache.org> archived-at: Wed, 19 Apr 2017 16:35:55 -0000 Author: taylor Date: Wed Apr 19 16:35:51 2017 New Revision: 1791939 URL: http://svn.apache.org/viewvc?rev=1791939&view=rev Log: inherit title from psml, should not be hard-coded Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java Wed Apr 19 16:35:51 2017 @@ -334,8 +334,8 @@ public class PortalAdministrationImpl im Folder source = innerPageManager.getFolder(innerFolderTemplate); innerPageManager.deepCopyFolder(source, innerUserFolderPath, innerUserName); Folder newFolder = pageManager.getFolder(innerUserFolderPath); - newFolder.setTitle("My Home Space"); - newFolder.setShortTitle("My Space"); + //newFolder.setTitle("My Home Space"); + //newFolder.setShortTitle("My Space"); return null; } catch (SecurityException s1) { return s1; Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java Wed Apr 19 16:35:51 2017 @@ -21,7 +21,7 @@ import java.util.List; /** * Bean to be used by validators that need to execute a validation query against a list of datasources * - * @author Ruben Carvalho + * @author Ruben Carvalho * @version $Id$ */ public class DataSourcesValidationBean Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java Wed Apr 19 16:35:51 2017 @@ -16,6 +16,11 @@ */ package org.apache.jetspeed.healthcheck.validators; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.support.JdbcUtils; + +import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -23,16 +28,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.sql.DataSource; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.jdbc.support.JdbcUtils; - /** * Validator to check if the defined datasources are up and running * - * @author Ruben Carvalho + * @author Ruben Carvalho * @version $Id$ */ public class DatasourceAvailableHealthCheckValidator implements HealthCheckValidator Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java Wed Apr 19 16:35:51 2017 @@ -21,7 +21,7 @@ import org.apache.jetspeed.pipeline.valv /** * Interface to be implemented by validator classes which will be injected in {@link HealthCheckValve}. * - * @author Ruben Carvalho + * @author Ruben Carvalho * @version $Id$ */ public interface HealthCheckValidator Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java Wed Apr 19 16:35:51 2017 @@ -19,7 +19,7 @@ package org.apache.jetspeed.healthcheck. /** * This class is returned as the result of executing the validation method from a Validator class * - * @author Ruben Carvalho + * @author Ruben Carvalho * @version $Id$ */ public class HealthCheckValidatorResult Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java Wed Apr 19 16:35:51 2017 @@ -28,7 +28,7 @@ import org.apache.jetspeed.om.portlet.Po /** * Validator to check if the defined required applications have been initialised in the Jetspeed engine * - * @author Ruben Carvalho + * @author Ruben Carvalho * @version $Id$ */ public class PortletApplicationAvailableHeathCheckValidator implements HealthCheckValidator Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java?rev=1791939&r1=1791938&r2=1791939&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java Wed Apr 19 16:35:51 2017 @@ -35,7 +35,7 @@ import org.apache.jetspeed.request.Reque /** * Valve that performs a health check based on the validators injected from a Spring configutation file. * - * @author Ruben Carvalho + * @author Ruben Carvalho * @version $Id$ */ public class HealthCheckValve extends AbstractValve --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org