Return-Path: X-Original-To: apmail-tapestry-dev-archive@www.apache.org Delivered-To: apmail-tapestry-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B72D910CD4 for ; Thu, 12 Sep 2013 09:27:28 +0000 (UTC) Received: (qmail 56728 invoked by uid 500); 12 Sep 2013 09:27:27 -0000 Delivered-To: apmail-tapestry-dev-archive@tapestry.apache.org Received: (qmail 56462 invoked by uid 500); 12 Sep 2013 09:27:19 -0000 Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tapestry.apache.org Delivered-To: mailing list commits@tapestry.apache.org Received: (qmail 56455 invoked by uid 99); 12 Sep 2013 09:27:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Sep 2013 09:27:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DC0308BF6AF; Thu, 12 Sep 2013 09:27:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlusetti@apache.org To: commits@tapestry.apache.org Message-Id: <4352d7678a5147f48d2c3a678805c470@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: dashboard and service pages need to work with and without context Date: Thu, 12 Sep 2013 09:27:16 +0000 (UTC) Updated Branches: refs/heads/master 41e501344 -> 5bcdf9848 dashboard and service pages need to work with and without context Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5bcdf984 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5bcdf984 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5bcdf984 Branch: refs/heads/master Commit: 5bcdf984811e003f76707da6397a117f3be258eb Parents: 41e5013 Author: Massimo Lusetti Authored: Thu Sep 12 11:26:50 2013 +0200 Committer: Massimo Lusetti Committed: Thu Sep 12 11:26:50 2013 +0200 ---------------------------------------------------------------------- .../org/apache/tapestry5/corelib/pages/ExceptionReport.java | 2 ++ .../java/org/apache/tapestry5/corelib/pages/PageCatalog.java | 6 ++---- .../java/org/apache/tapestry5/corelib/pages/ServiceStatus.java | 6 ++---- .../java/org/apache/tapestry5/corelib/pages/T5Dashboard.java | 6 ++---- .../apache/tapestry5/corelib/pages/HibernateStatistics.java | 2 ++ 5 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5bcdf984/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java index 746bdfd..3676c20 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java @@ -20,6 +20,7 @@ import org.apache.tapestry5.alerts.AlertManager; import org.apache.tapestry5.annotations.ContentType; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.UnknownActivationContextCheck; import org.apache.tapestry5.internal.InternalConstants; import org.apache.tapestry5.internal.services.PageActivationContextCollector; import org.apache.tapestry5.internal.services.ReloadHelper; @@ -39,6 +40,7 @@ import java.util.regex.Pattern; * * @see org.apache.tapestry5.corelib.components.ExceptionDisplay */ +@UnknownActivationContextCheck(false) @ContentType("text/html") @Import(stack = "core", stylesheet = "ExceptionReport.css") public class ExceptionReport implements ExceptionReporter http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5bcdf984/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java index 9576b47..cffe9d5 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java @@ -16,10 +16,7 @@ package org.apache.tapestry5.corelib.pages; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.alerts.AlertManager; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.WhitelistAccessOnly; +import org.apache.tapestry5.annotations.*; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.beaneditor.Validate; import org.apache.tapestry5.corelib.components.Zone; @@ -46,6 +43,7 @@ import java.util.Set; * Lists out the currently loaded pages, using a {@link org.apache.tapestry5.corelib.components.Grid}. * Provides an option to force all pages to be loaded. In development mode, includes an option to clear the page cache. */ +@UnknownActivationContextCheck(false) @WhitelistAccessOnly public class PageCatalog { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5bcdf984/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java index b53c9c3..4c99023 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java @@ -15,10 +15,7 @@ package org.apache.tapestry5.corelib.pages; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.annotations.Cached; -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.WhitelistAccessOnly; +import org.apache.tapestry5.annotations.*; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.Registry; @@ -35,6 +32,7 @@ import java.util.List; *

* TODO: Add filters to control which services are displayed */ +@UnknownActivationContextCheck(false) @WhitelistAccessOnly public class ServiceStatus { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5bcdf984/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java index 3a54b30..e8c5695 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java @@ -16,10 +16,7 @@ package org.apache.tapestry5.corelib.pages; import org.apache.tapestry5.Block; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.annotations.ContentType; -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.WhitelistAccessOnly; +import org.apache.tapestry5.annotations.*; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.Symbol; import org.apache.tapestry5.services.dashboard.DashboardManager; @@ -28,6 +25,7 @@ import org.apache.tapestry5.services.dashboard.DashboardManager; * @see org.apache.tapestry5.services.dashboard.DashboardManager * @since 5.4 */ +@UnknownActivationContextCheck(false) @WhitelistAccessOnly @ContentType("text/html") @Import(stack = "core", stylesheet = "dashboard.css") http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5bcdf984/tapestry-hibernate/src/main/java/org/apache/tapestry5/corelib/pages/HibernateStatistics.java ---------------------------------------------------------------------- diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/corelib/pages/HibernateStatistics.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/corelib/pages/HibernateStatistics.java index fb2cfcb..890f0b3 100644 --- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/corelib/pages/HibernateStatistics.java +++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/corelib/pages/HibernateStatistics.java @@ -16,6 +16,7 @@ package org.apache.tapestry5.corelib.pages; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.UnknownActivationContextCheck; import org.apache.tapestry5.annotations.WhitelistAccessOnly; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.Symbol; @@ -30,6 +31,7 @@ import java.util.Collection; * * @since 5.1.0.2 */ +@UnknownActivationContextCheck(false) @WhitelistAccessOnly public class HibernateStatistics {