Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE6C4107A1 for ; Fri, 27 Dec 2013 01:53:03 +0000 (UTC) Received: (qmail 24451 invoked by uid 500); 27 Dec 2013 01:53:03 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 24426 invoked by uid 500); 27 Dec 2013 01:53:03 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 24418 invoked by uid 99); 27 Dec 2013 01:53:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Dec 2013 01:53:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C4B381A259; Fri, 27 Dec 2013 01:53:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johndament@apache.org To: commits@deltaspike.apache.org Date: Fri, 27 Dec 2013 01:53:05 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/deltaspike Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/deltaspike Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c26a4ef7 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c26a4ef7 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c26a4ef7 Branch: refs/heads/master Commit: c26a4ef7d9846ffcc7aab30dcc26e0a909c71c6c Parents: a3f626f 78ef204 Author: John D. Ament Authored: Thu Dec 26 20:51:52 2013 -0500 Committer: John D. Ament Committed: Thu Dec 26 20:51:52 2013 -0500 ---------------------------------------------------------------------- .../test/api/config/PropertyLoaderTest.java | 10 -- .../local/BdaAlternativeEarFileTest.java | 43 ++++++ .../alternative/local/BdaAlternativeTest.java | 29 +--- .../local/BdaAlternativeWarFileTest.java | 57 ++++++++ .../core/api/exclude/ExcludeEarFileTest.java | 46 +++++++ .../test/core/api/exclude/ExcludeTest.java | 44 +----- .../ExcludeTestProjectStageDevelopment.java | 31 +---- ...cludeTestProjectStageEarFileDevelopment.java | 52 +++++++ ...cludeTestProjectStageWarFileDevelopment.java | 62 +++++++++ .../core/api/exclude/ExcludeWarFileTest.java | 70 ++++++++++ .../BeanManagerProviderEarFileTest.java | 43 ++++++ .../api/provider/BeanManagerProviderTest.java | 30 +--- .../BeanManagerProviderWarFileTest.java | 46 +++++++ .../ClassDeactivationEarFileTest.java | 43 ++++++ .../impl/activation/ClassDeactivationTest.java | 47 +++++++ .../ClassDeactivationWarFileTest.java | 59 ++++++++ .../impl/activation/TestClassDeactivation.java | 80 ----------- .../impl/jmx/SimpleRegistrationEarFileTest.java | 43 ++++++ .../core/impl/jmx/SimpleRegistrationTest.java | 23 +--- .../impl/jmx/SimpleRegistrationWarFileTest.java | 47 +++++++ .../core/impl/util/JndiUtilsEarFileTest.java | 43 ++++++ .../test/core/impl/util/JndiUtilsTest.java | 35 +---- .../core/impl/util/JndiUtilsWarFileTest.java | 51 +++++++ .../impl/config/view/ViewConfigExtension.java | 14 ++ .../config/view/ViewConfigPathValidator.java | 113 +++++++++++++++ .../main/resources/META-INF/web-fragment.xml | 36 +++++ .../jsf/impl/config/view/validation/Pages.java | 29 ++++ .../validation/ViewConfigPathValidatorTest.java | 138 +++++++++++++++++++ .../PartialBeanAsInterfaceEarFileTest.java | 43 ++++++ .../uc001/PartialBeanAsInterfaceTest.java | 29 +--- .../PartialBeanAsInterfaceWarFileTest.java | 51 +++++++ .../core/api/partialbean/util/ArchiveUtils.java | 4 +- .../impl/src/test/resources/arquillian.xml | 4 +- deltaspike/modules/scheduler/impl/pom.xml | 6 + .../scheduler/impl/SchedulerExtension.java | 3 +- .../scheduler/custom/AutoRegisteredJob.java | 26 ++++ .../scheduler/custom/CustomConfigSource.java | 65 +++++++++ .../test/scheduler/custom/CustomJob.java | 23 ++++ .../custom/CustomSchedulerEarFileTest.java | 43 ++++++ .../scheduler/custom/CustomSchedulerTest.java | 96 +++++++++++++ .../custom/CustomSchedulerWarFileTest.java | 55 ++++++++ .../test/scheduler/custom/ManualJob.java | 26 ++++ .../test/scheduler/custom/MockedScheduler.java | 66 +++++++++ .../scheduler/custom/QuartzDeactivator.java | 33 +++++ .../test/scheduler/custom/TestJobManager.java | 104 ++++++++++++++ .../deltaspike/test/util/ArchiveUtils.java | 43 ++++++ .../impl/src/test/resources/META-INF/beans.xml | 24 ++++ ...ache.deltaspike.core.spi.config.ConfigSource | 20 +++ ...rg.apache.deltaspike.scheduler.spi.Scheduler | 20 +++ .../impl/src/test/resources/arquillian.xml | 83 +++++++++++ .../secured/SecuredAnnotationEarFileTest.java | 47 +++++++ .../secured/SecuredAnnotationTest.java | 19 +-- .../secured/SecuredAnnotationWarFileTest.java | 46 +++++++ .../deltaspike/test/util/ArchiveUtils.java | 4 +- deltaspike/parent/code/pom.xml | 6 +- .../EnterpriseArchiveProfileCategory.java | 27 ++++ 56 files changed, 2059 insertions(+), 321 deletions(-) ----------------------------------------------------------------------