You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2017/04/19 16:35:51 UTC
svn commit: r1791939 - in
/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed:
administration/ healthcheck/validators/ pipeline/valve/
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 <a href="mailto:ruben.carvalho@fmr.com">Ruben Carvalho</a>
+ * @author <a href="mailto:rub.carvalho.s@gmail.com">Ruben Carvalho</a>
* @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 <a href="mailto:ruben.carvalho@fmr.com">Ruben Carvalho</a>
+ * @author <a href="mailto:rub.carvalho.s@gmail.com">Ruben Carvalho</a>
* @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 <a href="mailto:ruben.carvalho@fmr.com">Ruben Carvalho</a>
+ * @author <a href="mailto:rub.carvalho.s@gmail.com">Ruben Carvalho</a>
* @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 <a href="mailto:ruben.carvalho@fmr.com">Ruben Carvalho</a>
+ * @author <a href="mailto:rub.carvalho.s@gmail.com">Ruben Carvalho</a>
* @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 <a href="mailto:ruben.carvalho@fmr.com">Ruben Carvalho</a>
+ * @author <a href="mailto:rub.carvalho.s@gmail.com">Ruben Carvalho</a>
* @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 <a href="mailto:ruben.carvalho@fmr.com">Ruben Carvalho</a>
+ * @author <a href="mailto:rub.carvalho.s@gmail.com">Ruben Carvalho</a>
* @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