[deltaspike] branch master updated: DELTASPIKE-1437 updated plugin version

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new cb0d4d07a DELTASPIKE-1437 updated plugin version
cb0d4d07a is described below

commit cb0d4d07a2ae8604f84eb4acaab89f4bd0504e72
Author: gpetracek 
AuthorDate: Fri Feb 17 00:46:10 2023 +0100

DELTASPIKE-1437 updated plugin version
---
 deltaspike/parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 06f332f14..e52a91b73 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -80,7 +80,7 @@
 3.1.2
 2.4
 2.16
-3.8.1
+3.10.1
 3.2.0
 3.0
 

[deltaspike] branch master updated: DELTASPIKE-1437 updated build configuration

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new 38ed117dd DELTASPIKE-1437 updated build configuration
38ed117dd is described below

commit 38ed117dd31ab5de6624a94e13d6a1faa87d2a9a
Author: gpetracek 
AuthorDate: Fri Feb 17 00:45:20 2023 +0100

DELTASPIKE-1437 updated build configuration
---
 deltaspike/parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index edca8acd8..06f332f14 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -706,8 +706,7 @@
 maven-compiler-plugin
 ${maven.compiler.plugin.version}
 
-${java.version}
-${java.version}
+${java.version}
 
 
 

[deltaspike] branch master updated: DELTASPIKE-1437 changed jdk version

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new 289fc67f8 DELTASPIKE-1437 changed jdk version
289fc67f8 is described below

commit 289fc67f87f081a83c6384c97c85fffc10770c82
Author: gpetracek 
AuthorDate: Fri Feb 17 00:43:20 2023 +0100

DELTASPIKE-1437 changed jdk version
---
 deltaspike/parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 79b9440d2..edca8acd8 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -47,7 +47,7 @@
 2011
 
 
-17
+11
 4.0.0-SNAPSHOT
 
 

[deltaspike] 01/04: DELTASPIKE-1460 moved outdated parts

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit 538a075dd8908949880e02aad240bbed146f0daf
Author: gpetracek 
AuthorDate: Fri Feb 17 00:39:58 2023 +0100

DELTASPIKE-1460 moved outdated parts
---
 .../src/main/java/org/apache/deltaspike/proxy/api/EnableInterceptors.java | 0
 .../org/apache/deltaspike/proxy/util/EnableInterceptorsInterceptor.java   | 0
 .../deltaspike/proxy/impl/enableinterceptors/EnableInterceptorsTest.java  | 0
 .../java/org/apache/deltaspike/proxy/impl/enableinterceptors/MyBean.java  | 0
 .../deltaspike/proxy/impl/enableinterceptors/MyBeanInterceptor.java   | 0
 .../proxy/impl/enableinterceptors/MyBeanInterceptorBinding.java   | 0
 .../apache/deltaspike/proxy/impl/enableinterceptors/MyBeanProducer.java   | 0
 .../proxy/impl/enableinterceptors/dynamicbinding/MyRepository.java| 0
 .../impl/enableinterceptors/dynamicbinding/MyRepositoryProducer.java  | 0
 .../proxy/impl/enableinterceptors/dynamicbinding/SimpleCache.java | 0
 .../impl/enableinterceptors/dynamicbinding/SimpleCacheExtension.java  | 0
 .../impl/enableinterceptors/dynamicbinding/SimpleCacheInterceptor.java| 0
 .../proxy/impl/enableinterceptors/dynamicbinding/SimpleCacheManager.java  | 0
 .../proxy/impl/enableinterceptors/dynamicbinding/SimpleCacheTest.java | 0
 .../apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java   | 0
 .../deltaspike/testcontrol/impl/jsf/MockedJsfTestContainerAdapter.java| 0
 .../apache/deltaspike/testcontrol/impl/jsf/MyFacesContainerAdapter.java   | 0
 .../testcontrol/impl/jsf/MyFacesContainerPerTestMethodAdapter.java| 0
 .../org/apache/deltaspike/testcontrol/impl/jsf/MyFacesTestBaseConfig.java | 0
 .../impl/transaction/TransactionStatementDecoratorFactory.java| 0
 .../deltaspike/test/testcontrol/InternalMyFacesTestContainerAdapter.java  | 0
 .../deltaspike/test/testcontrol/mock/shared/ApplicationScopedBean.java| 0
 .../org/apache/deltaspike/test/testcontrol/mock/shared/MyQualifier.java   | 0
 .../apache/deltaspike/test/testcontrol/mock/shared/RequestScopedBean.java | 0
 .../apache/deltaspike/test/testcontrol/mock/shared/SessionScopedBean.java | 0
 .../test/testcontrol/mock/uc001/MockedRequestScopedBeanTest.java  | 0
 .../test/testcontrol/mock/uc002/MockedSessionScopedBeanTest.java  | 0
 .../deltaspike/test/testcontrol/mock/uc003/MockedSessionScopedBean.java   | 0
 .../testcontrol/mock/uc003/MockedSessionScopedBeanAcrossMethodsTest.java  | 0
 .../test/testcontrol/mock/uc004/MockedApplicationScopedBean.java  | 0
 .../test/testcontrol/mock/uc004/MockedApplicationScopedBeanTest.java  | 0
 .../deltaspike/test/testcontrol/mock/uc005/MockedProducedBeanTest.java| 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBean.java   | 0
 .../deltaspike/test/testcontrol/mock/uc005/ProducedBeanProducer.java  | 0
 .../test/testcontrol/mock/uc006/MockedRequestScopedQualifiedBeanTest.java | 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc006/QualifiedBean.java  | 0
 .../test/testcontrol/mock/uc007/MockedProducedQualifiedBeanTest.java  | 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBean.java   | 0
 .../deltaspike/test/testcontrol/mock/uc007/ProducedBeanProducer.java  | 0
 .../deltaspike/test/testcontrol/mock/uc008/MockedTypedBeanTest.java   | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/T1.java   | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/T2.java   | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/T3.java   | 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean1and2.java | 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean3.java | 0
 .../test/testcontrol/mock/uc009/MockedTypedProducedBeanTest.java  | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/T1.java   | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/T2.java   | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/T3.java   | 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean1and2.java | 0
 .../org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean3.java | 0
 .../apache/deltaspike/test/testcontrol/mock/uc009/TypedBeanProducer.java  | 0
 .../test/testcontrol/mock/uc010/MockedRequestScopedBeanTest.java  | 0
 .../test/testcontrol/mock/uc011/MockedRequestScopedBeanWithInjection.java | 0
 .../testcontrol/mock/uc011/MockedRequestScopedBeanWithInjectionTest.java  | 0
 .../test/testcontrol/mock/uc012/MockedRequestScopedBeanWithInjection.java | 0
 .../testcontrol/mock/uc012/MockedRequestScopedBeanWithInjectionTest.java  | 0
 .../test/testcontrol/mock/uc013/MockedTypedProducedBeanTest.java  | 0
 .../test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/T1.java   | 0

[deltaspike] branch master updated (64d9d0af7 -> e51845ad6)

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


from 64d9d0af7 DELTASPIKE-1437 updated dependencies
 new 538a075dd DELTASPIKE-1460 moved outdated parts
 new 9ddb61ff1 DELTASPIKE-1460 dropped outdated test-configs
 new a15b16e64 DELTASPIKE-1460 dropped outdated dependencies
 new e51845ad6 DELTASPIKE-1460 updated active modules

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 deltaspike/modules/pom.xml |  4 ++--
 .../deltaspike/proxy/api/EnableInterceptors.java   |  0
 .../proxy/util/EnableInterceptorsInterceptor.java  |  0
 .../enableinterceptors/EnableInterceptorsTest.java |  0
 .../proxy/impl/enableinterceptors/MyBean.java  |  0
 .../impl/enableinterceptors/MyBeanInterceptor.java |  0
 .../MyBeanInterceptorBinding.java  |  0
 .../impl/enableinterceptors/MyBeanProducer.java|  0
 .../dynamicbinding/MyRepository.java   |  0
 .../dynamicbinding/MyRepositoryProducer.java   |  0
 .../dynamicbinding/SimpleCache.java|  0
 .../dynamicbinding/SimpleCacheExtension.java   |  0
 .../dynamicbinding/SimpleCacheInterceptor.java |  0
 .../dynamicbinding/SimpleCacheManager.java |  0
 .../dynamicbinding/SimpleCacheTest.java|  0
 .../impl/jsf/MockedJsf2TestContainer.java  |  0
 .../impl/jsf/MockedJsfTestContainerAdapter.java|  0
 .../impl/jsf/MyFacesContainerAdapter.java  |  0
 .../jsf/MyFacesContainerPerTestMethodAdapter.java  |  0
 .../impl/jsf/MyFacesTestBaseConfig.java|  0
 .../TransactionStatementDecoratorFactory.java  |  0
 .../InternalMyFacesTestContainerAdapter.java   |  0
 .../mock/shared/ApplicationScopedBean.java |  0
 .../test/testcontrol/mock/shared/MyQualifier.java  |  0
 .../testcontrol/mock/shared/RequestScopedBean.java |  0
 .../testcontrol/mock/shared/SessionScopedBean.java |  0
 .../mock/uc001/MockedRequestScopedBeanTest.java|  0
 .../mock/uc002/MockedSessionScopedBeanTest.java|  0
 .../mock/uc003/MockedSessionScopedBean.java|  0
 .../MockedSessionScopedBeanAcrossMethodsTest.java  |  0
 .../mock/uc004/MockedApplicationScopedBean.java|  0
 .../uc004/MockedApplicationScopedBeanTest.java |  0
 .../mock/uc005/MockedProducedBeanTest.java |  0
 .../test/testcontrol/mock/uc005/ProducedBean.java  |  0
 .../mock/uc005/ProducedBeanProducer.java   |  0
 .../MockedRequestScopedQualifiedBeanTest.java  |  0
 .../test/testcontrol/mock/uc006/QualifiedBean.java |  0
 .../uc007/MockedProducedQualifiedBeanTest.java |  0
 .../test/testcontrol/mock/uc007/ProducedBean.java  |  0
 .../mock/uc007/ProducedBeanProducer.java   |  0
 .../mock/uc008/MockedTypedBeanTest.java|  0
 .../deltaspike/test/testcontrol/mock/uc008/T1.java |  0
 .../deltaspike/test/testcontrol/mock/uc008/T2.java |  0
 .../deltaspike/test/testcontrol/mock/uc008/T3.java |  0
 .../testcontrol/mock/uc008/TypedBean1and2.java |  0
 .../test/testcontrol/mock/uc008/TypedBean3.java|  0
 .../mock/uc009/MockedTypedProducedBeanTest.java|  0
 .../deltaspike/test/testcontrol/mock/uc009/T1.java |  0
 .../deltaspike/test/testcontrol/mock/uc009/T2.java |  0
 .../deltaspike/test/testcontrol/mock/uc009/T3.java |  0
 .../testcontrol/mock/uc009/TypedBean1and2.java |  0
 .../test/testcontrol/mock/uc009/TypedBean3.java|  0
 .../testcontrol/mock/uc009/TypedBeanProducer.java  |  0
 .../mock/uc010/MockedRequestScopedBeanTest.java|  0
 .../MockedRequestScopedBeanWithInjection.java  |  0
 .../MockedRequestScopedBeanWithInjectionTest.java  |  0
 .../MockedRequestScopedBeanWithInjection.java  |  0
 .../MockedRequestScopedBeanWithInjectionTest.java  |  0
 .../mock/uc013/MockedTypedProducedBeanTest.java|  0
 .../deltaspike/test/testcontrol/mock/uc013/T1.java |  0
 .../deltaspike/test/testcontrol/mock/uc013/T2.java |  0
 .../deltaspike/test/testcontrol/mock/uc013/T3.java |  0
 .../testcontrol/mock/uc013/TypedBean1and2.java |  0
 .../test/testcontrol/mock/uc013/TypedBean3.java|  0
 .../testcontrol/mock/uc013/TypedBeanProducer.java  |  0
 .../mock/uc014/MockedTypedProducedBeanTest.java|  0
 .../deltaspike/test/testcontrol/mock/uc014/T1.java |  0
 .../deltaspike/test/testcontrol/mock/uc014/T2.java |  0
 .../deltaspike/test/testcontrol/mock/uc014/T3.java |  0
 .../testcontrol/mock/uc014/TypedBean1and2.java |  0
 .../test/testcontrol/mock/uc014/TypedBean3.java|  0
 .../testcontrol/mock/uc014/TypedBeanProducer.java  |  0
 .../mock/uc016/CustomMockManagerTest.java  |  0
 .../testcontrol/uc005/MockedJsfContainerTest.java  |  0
 .../uc006/SkipExtern

[deltaspike] 04/04: DELTASPIKE-1460 updated active modules

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit e51845ad6d8f33bee4532539c433a228cda37962
Author: gpetracek 
AuthorDate: Fri Feb 17 00:42:27 2023 +0100

DELTASPIKE-1460 updated active modules
---
 deltaspike/modules/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deltaspike/modules/pom.xml b/deltaspike/modules/pom.xml
index 0f61668cb..056446a4d 100644
--- a/deltaspike/modules/pom.xml
+++ b/deltaspike/modules/pom.xml
@@ -36,14 +36,14 @@
 
 
 proxy
-security
 
 scheduler
+-->
 test-control
 
 

[deltaspike] 02/04: DELTASPIKE-1460 dropped outdated test-configs

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit 9ddb61ff1c9cf4c472fc67caf577969bde132a14
Author: gpetracek 
AuthorDate: Fri Feb 17 00:41:19 2023 +0100

DELTASPIKE-1460 dropped outdated test-configs
---
 .../src/test/resources/META-INF/apache-deltaspike.properties | 9 -
 .../test-control/impl/src/test/resources/META-INF/beans.xml  | 1 -
 2 files changed, 10 deletions(-)

diff --git 
a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties
 
b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties
index d86331a86..6d077d15a 100644
--- 
a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties
+++ 
b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties
@@ -23,14 +23,5 @@ 
org.apache.deltaspike.core.spi.activation.ClassDeactivator=org.apache.deltaspike
 
 
deltaspike.testcontrol.test-container.config-file.UnitTest=META-INF/test/dsTestContainerBootConfig.properties
 
-labeledAlternatives[testLabelX].org.apache.deltaspike.test.testcontrol.uc014.TestService=org.apache.deltaspike.test.testcontrol.uc014.TestServiceLabelX
-labeledAlternatives[y].org.apache.deltaspike.test.testcontrol.uc014.TestService=org.apache.deltaspike.test.testcontrol.uc014.TestServiceLabelY
-
-globalAlternatives.org.apache.deltaspike.test.testcontrol.uc015.TestService=org.apache.deltaspike.test.testcontrol.uc015.GlobalAlternativeTestService
-labeledAlternatives[lbl].org.apache.deltaspike.test.testcontrol.uc015.TestService=org.apache.deltaspike.test.testcontrol.uc015.LabeledTestService
-
-labeledAlternatives[label].org.apache.deltaspike.test.testcontrol.uc017.DefaultTestServiceProducer=org.apache.deltaspike.test.testcontrol.uc017.LabeledTestServiceProducer
-labeledAlternatives[label].org.apache.deltaspike.test.testcontrol.uc018.InterceptedTestServiceProducer=org.apache.deltaspike.test.testcontrol.uc018.LabeledTestServiceProducer
-
 #only needed because our test-suite is based on cdi v1.0. with v1.1+ and 
@Priority (which is the target of this use-case) the following part isn't 
needed:
 
org.apache.deltaspike.core.spi.filter.ClassFilter=org.apache.deltaspike.test.testcontrol.uc019.TestBeanClassFilter
\ No newline at end of file
diff --git 
a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml 
b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml
index d22d69542..d8353857b 100644
--- a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml
@@ -23,7 +23,6 @@
 
 
org.apache.deltaspike.test.testcontrol.uc011.TestInterceptorImplementation
 
org.apache.deltaspike.test.testcontrol.mock.uc015.TestInterceptorImplementation
-
org.apache.deltaspike.test.testcontrol.uc018.TestUpperCaseInterceptorImplementation
 
 
 

[deltaspike] 03/04: DELTASPIKE-1460 dropped outdated dependencies

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit a15b16e64d1a47979bd4c03b2f41af122c4a6589
Author: gpetracek 
AuthorDate: Fri Feb 17 00:41:49 2023 +0100

DELTASPIKE-1460 dropped outdated dependencies
---
 deltaspike/modules/test-control/impl/pom.xml | 28 
 1 file changed, 28 deletions(-)

diff --git a/deltaspike/modules/test-control/impl/pom.xml 
b/deltaspike/modules/test-control/impl/pom.xml
index 2b882f576..037fa40a8 100644
--- a/deltaspike/modules/test-control/impl/pom.xml
+++ b/deltaspike/modules/test-control/impl/pom.xml
@@ -68,34 +68,6 @@
 provided
 
 
-
-org.apache.myfaces.test
-myfaces-test20
-${myfaces.version}
-provided
-
-
-
-org.apache.myfaces.core
-myfaces-impl-test
-${myfaces.version}
-provided
-
-
-
-org.apache.myfaces.core
-myfaces-api
-${myfaces.version}
-provided
-
-
-
-org.apache.myfaces.core
-myfaces-impl
-${myfaces.version}
-provided
-
-
 
 jakarta.el
 jakarta.el-api

[deltaspike] branch master updated: DELTASPIKE-1437 updated dependencies

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new 64d9d0af7 DELTASPIKE-1437 updated dependencies
64d9d0af7 is described below

commit 64d9d0af71ecd30ba5454d8e84ce67e2060f5998
Author: gpetracek 
AuthorDate: Thu Feb 16 22:35:32 2023 +0100

DELTASPIKE-1437 updated dependencies
---
 deltaspike/modules/partial-bean/api/pom.xml  | 1 +
 deltaspike/modules/partial-bean/impl/pom.xml | 5 +
 2 files changed, 6 insertions(+)

diff --git a/deltaspike/modules/partial-bean/api/pom.xml 
b/deltaspike/modules/partial-bean/api/pom.xml
index f746e71ce..c24f229ae 100644
--- a/deltaspike/modules/partial-bean/api/pom.xml
+++ b/deltaspike/modules/partial-bean/api/pom.xml
@@ -47,6 +47,7 @@
 
 org.apache.deltaspike.core
 deltaspike-core-api
+${project.version}
 
 
 
diff --git a/deltaspike/modules/partial-bean/impl/pom.xml 
b/deltaspike/modules/partial-bean/impl/pom.xml
index 250ca5a16..9b7d9dcb6 100644
--- a/deltaspike/modules/partial-bean/impl/pom.xml
+++ b/deltaspike/modules/partial-bean/impl/pom.xml
@@ -53,26 +53,31 @@
 
 org.apache.deltaspike.core
 deltaspike-core-api
+${project.version}
 
 
 org.apache.deltaspike.core
 deltaspike-core-impl
+${project.version}
 runtime
 
 
 
 org.apache.deltaspike.modules
 deltaspike-partial-bean-module-api
+${project.version}
 
 
 
 org.apache.deltaspike.modules
 deltaspike-proxy-module-api
+${project.version}
 
 
 
 org.apache.deltaspike.modules
 deltaspike-proxy-module-impl-asm
+${project.version}
 
 
 

[deltaspike] 03/03: DELTASPIKE-1385 added support for init under high load

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit 8936f921f39d270ecd5cc762d92c0b66f579b61d
Author: gpetracek 
AuthorDate: Mon Aug 12 21:45:31 2019 +0200

DELTASPIKE-1385 added support for init under high load
---
 .../deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java | 3 ++-
 .../config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java  | 2 +-
 .../config/view/navigation/ViewConfigAwareNavigationHandler.java   | 5 +++--
 .../jsf/impl/listener/phase/DeltaSpikePhaseListener.java   | 7 ++-
 .../jsf/impl/navigation/NavigationHandlerAwareApplication.java | 4 ++--
 .../deltaspike/jsf/impl/security/SecurityAwareViewHandler.java | 7 ++-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
index b0f3175..92c1d89 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
@@ -127,8 +127,9 @@ public class WindowIdHtmlRenderer extends Renderer
 if (clientWindow == null)
 {
 clientWindowConfig = 
BeanProvider.getContextualReference(ClientWindowConfig.class);
-clientWindow = 
BeanProvider.getContextualReference(ClientWindow.class);
 maxWindowIdLength = 
ClientWindowHelper.getMaxWindowIdLength();
+
+clientWindow = 
BeanProvider.getContextualReference(ClientWindow.class);
 }
 }
 }
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
index 33af77f..f6f97fb 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
@@ -43,7 +43,7 @@ public class DefaultErrorViewAwareExceptionHandlerWrapper 
extends ExceptionHandl
 {
 private ExceptionHandler wrapped;
 
-private ViewNavigationHandler viewNavigationHandler;
+private volatile ViewNavigationHandler viewNavigationHandler;
 
 /**
  * Constructor used by proxy libs
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
index a3171f8..0bc189f 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
@@ -48,7 +48,7 @@ public class ViewConfigAwareNavigationHandler extends 
NavigationHandler
 
 private final NavigationHandler navigationHandler;
 
-private BeanManager beanManager;
+private volatile BeanManager beanManager;
 
 private NavigationParameterContext navigationParameterContext;
 
@@ -259,11 +259,12 @@ public class ViewConfigAwareNavigationHandler extends 
NavigationHandler
 {
 if (this.beanManager == null)
 {
-this.beanManager = 
BeanManagerProvider.getInstance().getBeanManager();
 this.navigationParameterContext =
 
BeanProvider.getContextualReference(NavigationParameterContext.class);
 this.viewConfigResolver =
 
BeanProvider.getContextualReference(ViewConfigResolver.class);
+
+this.beanManager = 
BeanManagerProvider.getInstance().getBeanManager();
 }
 }
 }
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
index adda43a..7f1c062 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
@@ -52,7 +52,7 @@ public class DeltaSpikePhaseListener implements

[deltaspike] 01/03: DELTASPIKE-1385 added support for init under high load

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit 8cc79884c6e2d0490eaa3a3c69dc6d0073973783
Author: gpetracek 
AuthorDate: Mon Aug 12 21:42:04 2019 +0200

DELTASPIKE-1385 added support for init under high load
---
 .../java/org/apache/deltaspike/core/util/ProjectStageProducer.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index 6a2e216..33f3dca 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -72,7 +72,7 @@ public class ProjectStageProducer implements Serializable
 /**
  * The detected ProjectStage
  */
-private static ProjectStage projectStage;
+private static volatile ProjectStage projectStage;
 
 /**
  * for the singleton factory
@@ -134,9 +134,10 @@ public class ProjectStageProducer implements Serializable
 return;
 }
 
-projectStageProducer = new ProjectStageProducer();
+ProjectStageProducer newProjectStageProducer = new 
ProjectStageProducer();
+newProjectStageProducer.initProjectStage();
 
-projectStageProducer.initProjectStage();
+projectStageProducer = newProjectStageProducer;
 }
 
 /**

[deltaspike] 02/03: DELTASPIKE-1385 added support for init under high load

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit 752a4a57fa79a939dc1713d4c8bbc83b3fc6df5e
Author: gpetracek 
AuthorDate: Mon Aug 12 21:43:38 2019 +0200

DELTASPIKE-1385 added support for init under high load
---
 .../beanvalidation/impl/CDIAwareConstraintValidatorFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
 
b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
index e0f21b8..d5ec4a9 100644
--- 
a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
+++ 
b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
@@ -37,7 +37,7 @@ public class CDIAwareConstraintValidatorFactory implements
 ConstraintValidatorFactory
 {
 private static final String RELEASE_INSTANCE_METHOD_NAME = 
"releaseInstance";
-private static Boolean releaseInstanceMethodFound;
+private static volatile Boolean releaseInstanceMethodFound;
 private static Method releaseInstanceMethod;
 
 private final Logger log = Logger

[deltaspike] branch master updated (4cfb466 -> 8936f92)

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git.


from 4cfb466  fixed build on Maven 3.6 (MNG-6649)
 new 8cc7988  DELTASPIKE-1385 added support for init under high load
 new 752a4a5  DELTASPIKE-1385 added support for init under high load
 new 8936f92  DELTASPIKE-1385 added support for init under high load

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/deltaspike/core/util/ProjectStageProducer.java | 7 ---
 .../beanvalidation/impl/CDIAwareConstraintValidatorFactory.java| 2 +-
 .../deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java | 3 ++-
 .../config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java  | 2 +-
 .../config/view/navigation/ViewConfigAwareNavigationHandler.java   | 5 +++--
 .../jsf/impl/listener/phase/DeltaSpikePhaseListener.java   | 7 ++-
 .../jsf/impl/navigation/NavigationHandlerAwareApplication.java | 4 ++--
 .../deltaspike/jsf/impl/security/SecurityAwareViewHandler.java | 7 ++-
 8 files changed, 25 insertions(+), 12 deletions(-)

[deltaspike] branch master updated: DELTASPIKE-1383 fixed formatting

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new 2ae479e  DELTASPIKE-1383 fixed formatting
2ae479e is described below

commit 2ae479efbafe7e09b1d43b3ed9ff00ef51985072
Author: gpetracek 
AuthorDate: Wed Jun 26 22:46:50 2019 +0100

DELTASPIKE-1383 fixed formatting
---
 .../java/org/apache/deltaspike/security/impl/extension/Authorizer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
 
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
index c348632..c2b93fb 100644
--- 
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
+++ 
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
@@ -217,7 +217,8 @@ class Authorizer
 method.getName() + "]");
 }
 
-boundAuthorizerMethodProxy = new 
InjectableMethod(boundAuthorizerMethod, foundBoundAuthorizerBean, beanManager);
+boundAuthorizerMethodProxy = new InjectableMethod(
+boundAuthorizerMethod, foundBoundAuthorizerBean, beanManager);
 boundAuthorizerBean = foundBoundAuthorizerBean;
 }
 }

[deltaspike] branch master updated: DELTASPIKE-1383 Fix multiple threads causing NPE in Authorizer

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new d95495b  DELTASPIKE-1383 Fix multiple threads causing NPE in Authorizer
d95495b is described below

commit d95495b81b52f15f4712ba062c404eb33ecc892b
Author: hidde.wieringa 
AuthorDate: Wed Jun 19 09:46:50 2019 +0200

DELTASPIKE-1383 Fix multiple threads causing NPE in Authorizer
---
 .../org/apache/deltaspike/security/impl/extension/Authorizer.java  | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
 
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
index bf90867..c348632 100644
--- 
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
+++ 
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
@@ -208,16 +208,17 @@ class Authorizer
 Method method = boundAuthorizerMethod.getJavaMember();
 
 Set> beans = 
beanManager.getBeans(method.getDeclaringClass());
-boundAuthorizerBean = beanManager.resolve(beans);
+Bean foundBoundAuthorizerBean = beanManager.resolve(beans);
 
-if (boundAuthorizerBean == null)
+if (foundBoundAuthorizerBean == null)
 {
 throw new IllegalStateException("Exception looking up 
authorizer method bean - " +
 "no beans found for method [" + 
method.getDeclaringClass() + "." +
 method.getName() + "]");
 }
 
-boundAuthorizerMethodProxy = new 
InjectableMethod(boundAuthorizerMethod, boundAuthorizerBean, beanManager);
+boundAuthorizerMethodProxy = new 
InjectableMethod(boundAuthorizerMethod, foundBoundAuthorizerBean, beanManager);
+boundAuthorizerBean = foundBoundAuthorizerBean;
 }
 }
 

[deltaspike] branch master updated: DELTASPIKE-1378 fixed initialization of EntityManagerRefLookup

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new eb6ae03  DELTASPIKE-1378 fixed initialization of EntityManagerRefLookup
eb6ae03 is described below

commit eb6ae03a3286232ad0606d2f2bf6f4eb82607ab6
Author: gpetracek 
AuthorDate: Wed May 15 00:31:58 2019 +0200

DELTASPIKE-1378 fixed initialization of EntityManagerRefLookup
---
 .../deltaspike/jpa/impl/entitymanager/EntityManagerRefLookup.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerRefLookup.java
 
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerRefLookup.java
index 9b1c96e..7d048ed 100644
--- 
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerRefLookup.java
+++ 
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerRefLookup.java
@@ -54,8 +54,6 @@ public class EntityManagerRefLookup
 // switch into paranoia mode
 if (this.globalEntityManagerInitialized == null)
 {
-this.globalEntityManagerInitialized = true;
-
 BeanManager beanManager = 
BeanManagerProvider.getInstance().getBeanManager();
 Set> beans = beanManager.getBeans(EntityManager.class);
 Bean bean = beanManager.resolve(beans);
@@ -72,6 +70,8 @@ public class EntityManagerRefLookup
 EntityManager.class,
 beanManager.createCreationalContext(bean));   
 }
+
+this.globalEntityManagerInitialized = true;
 }
 }
 

[deltaspike] branch master updated: DELTASPIKE-1373:fix doc core and InjectableResource

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new 2a4ecc1  DELTASPIKE-1373:fix doc core and InjectableResource
 new 6de805f  Merge pull request #87 from Daniel-Dos/adjusts-doc-core
2a4ecc1 is described below

commit 2a4ecc1293dc2aa91927fdb36e2cedb047ff96a3
Author: Daniel Dias 
AuthorDate: Mon Mar 18 15:38:48 2019 -0300

DELTASPIKE-1373:fix doc core and InjectableResource
---
 .../apache/deltaspike/core/api/resourceloader/InjectableResource.java | 4 ++--
 documentation/src/main/asciidoc/core.adoc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
index aaffc27..4b40788 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
@@ -37,11 +37,11 @@ import static java.lang.annotation.ElementType.METHOD;
  * Example:
  * 
  * Inject
- * InjectableResource("myfile.properties")
+ * InjectableResource(location="myfile.properties")
  * private Properties props;
  *
  * Inject
- * InjectableResource("config.xml")
+ * InjectableResource(location="config.xml")
  * private InputStream inputStream;
  * 
  *
diff --git a/documentation/src/main/asciidoc/core.adoc 
b/documentation/src/main/asciidoc/core.adoc
index 9fd5dce..94fc16d 100644
--- a/documentation/src/main/asciidoc/core.adoc
+++ b/documentation/src/main/asciidoc/core.adoc
@@ -639,7 +639,7 @@ property file reading.
 [source,java]
 
 @Inject
-@InjectableResource("myfile.properties")
+@InjectableResource(location="myfile.properties")
 private InputStream inputStream;
 
 

[deltaspike] branch master updated (fcb567c -> d2c0cd8)

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git.


from fcb567c  Merge pull request #86 from j-be/DELTASPIKE-1372
 new ebfbe44  DELTASPIKE-1369: Introduce SchedulerControl and default 
implementation.
 new 5cdb397  DELTASPIKE-1369: Hook up 
SchedulerControl.isSchedulerEnabled().
 new f85fc9d  DELTASPIKE-1369: Extract JobRunnableAdapter to generic base 
class.
 new 9c875cb  DELTASPIKE-1369: Hook up 
SchedulerControl.shouldJobBeStarted().
 new 9fe0cef  DELTASPIKE-1369: Add JavaDoc to SchedulerControl.
 new 8e5e03a  DELTASPIKE-1369: Remove unneeded throws from execute() 
methods.
 new 2d2f3c1  DELTASPIKE-1369: Move SchedulerControl to spi package.
 new b3347a4  DELTASPIKE-1369: Fix typo in JavaDoc.
 new f807e02  DELTASPIKE-1369: Switch to conditdional lookup.
 new 20bd217  DELTASPIKE-1369: Switch to veto logic for job control.
 new f9c1903  DELTASPIKE-1369: Don't touch this.isActivated.
 new 2dcf476  DELTASPIKE-1369: Add log statement if scheduler was disabled.
 new c37d3a0  DELTASPIKE-1369: Add log statement if job execution was 
vetoed.
 new 47453af  DELTASPIKE-1369: Add default implementations to 
SchedulerControl.
 new d2c0cd8  Merge pull request #84 from j-be/scheduler-control

The 2331 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../deltaspike/scheduler/spi/SchedulerControl.java | 53 ++
 ...unnableAdapter.java => AbstractJobAdapter.java} | 32 +
 .../{JobQuartzScheduler.java => JobAdapter.java}   | 19 ++--
 .../scheduler/impl/JobQuartzScheduler.java |  8 +++-
 .../scheduler/impl/JobRunnableAdapter.java | 35 --
 .../scheduler/impl/SchedulerExtension.java | 36 ++-
 6 files changed, 131 insertions(+), 52 deletions(-)
 create mode 100644 
deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/SchedulerControl.java
 copy 
deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/{JobRunnableAdapter.java
 => AbstractJobAdapter.java} (59%)
 copy 
deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/{JobQuartzScheduler.java
 => JobAdapter.java} (67%)

[deltaspike] branch master updated: DELTASPIKE-1372 Fix test-control's dependencies.

[gpetracek]

This is an automated email from the ASF dual-hosted git repository.

gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
 new 4dca77e  DELTASPIKE-1372 Fix test-control's dependencies.
 new fcb567c  Merge pull request #86 from j-be/DELTASPIKE-1372
4dca77e is described below

commit 4dca77e08d0ff56d3c34ef9079d5727c3bd2c801
Author: Juri Berlanda 
AuthorDate: Wed Mar 13 16:43:09 2019 +0100

DELTASPIKE-1372 Fix test-control's dependencies.

Test-Control module has a de-facto runtime dependency on core-impl, which
is neither documented, nor declared in the pom. This commit adds it so
Test-Control works as described in the documentation.
---
 deltaspike/modules/test-control/impl/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deltaspike/modules/test-control/impl/pom.xml 
b/deltaspike/modules/test-control/impl/pom.xml
index 68df2fa..b040940 100644
--- a/deltaspike/modules/test-control/impl/pom.xml
+++ b/deltaspike/modules/test-control/impl/pom.xml
@@ -116,7 +116,7 @@
 
 org.apache.deltaspike.core
 deltaspike-core-impl
-test
+runtime
 
 
 

deltaspike git commit: DELTASPIKE-1361 small improvements (esp. for CdiTestRunner)

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master a62bec4dd -> 6aceb6f34


DELTASPIKE-1361 small improvements (esp. for CdiTestRunner)


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6aceb6f3
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6aceb6f3
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6aceb6f3

Branch: refs/heads/master
Commit: 6aceb6f3437e608dae8f19c57c6578fcce72752e
Parents: a62bec4
Author: gpetracek 
Authored: Wed Oct 31 22:29:13 2018 +0100
Committer: gpetracek 
Committed: Wed Oct 31 22:29:13 2018 +0100

--
 .../testcontrol/api/junit/CdiTestRunner.java| 33 ++--
 .../api/junit/CdiTestSuiteRunner.java   | 31 +++---
 2 files changed, 50 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6aceb6f3/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index 11be0d4..70ec6e5 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -64,6 +64,8 @@ import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static java.lang.Boolean.TRUE;
+
 /**
  * A JUnit test runner to start up with a CDI or embedded JavaEE container.
  *
@@ -132,16 +134,27 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 @Override
 public void run(RunNotifier runNotifier)
 {
-if (!CdiTestSuiteRunner.isContainerStarted()) //not called as a part 
of a test-suite
+try
 {
-int identityHashCode = System.identityHashCode(runNotifier);
-if (!notifierIdentities.contains(identityHashCode))
+CdiTestSuiteRunner.getCdiTestRunnerExecutionRef().set(TRUE);
+
+if (!CdiTestSuiteRunner.isContainerStarted()) //not called as a 
part of a test-suite
 {
-addLogRunListener(runNotifier, identityHashCode);
+int identityHashCode = System.identityHashCode(runNotifier);
+if (!notifierIdentities.contains(identityHashCode))
+{
+addLogRunListener(runNotifier, identityHashCode);
+}
 }
-}
 
-super.run(runNotifier);
+super.run(runNotifier);
+
+}
+finally
+{
+CdiTestSuiteRunner.getCdiTestRunnerExecutionRef().set(null);
+CdiTestSuiteRunner.getCdiTestRunnerExecutionRef().remove();
+}
 }
 
 private static synchronized void addLogRunListener(RunNotifier notifier, 
int identityHashCode)
@@ -608,8 +621,8 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 setCurrentTestMethod(null);
 ProjectStageProducer.setProjectStage(previousProjectStage);
 previousProjectStage = null;
-currentTestRunner.remove();
 currentTestRunner.set(null);
+currentTestRunner.remove();
 }
 }
 
@@ -626,7 +639,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 {
 try
 {
-automaticScopeHandlingActive.set(Boolean.TRUE);
+automaticScopeHandlingActive.set(TRUE);
 
 ContextControl contextControl = container.getContextControl();
 
@@ -700,8 +713,8 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 }
 finally
 {
-automaticScopeHandlingActive.remove();
 automaticScopeHandlingActive.set(null);
+automaticScopeHandlingActive.remove();
 }
 }
 
@@ -745,7 +758,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 {
 try
 {
-automaticScopeHandlingActive.set(Boolean.TRUE);
+automaticScopeHandlingActive.set(TRUE);
 
 while (!this.startedScopes.empty())
 {

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6aceb6f3/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
--
diff --git 
a/deltaspike/modules/t

deltaspike git commit: DELTASPIKE-1359 upgraded version numbers

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master a97f22412 -> a62bec4dd


DELTASPIKE-1359 upgraded version numbers


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a62bec4d
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a62bec4d
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a62bec4d

Branch: refs/heads/master
Commit: a62bec4dd3aae507bb39037fcde96c10a5f92bd8
Parents: a97f224
Author: gpetracek 
Authored: Thu Oct 25 11:11:42 2018 +0200
Committer: gpetracek 
Committed: Thu Oct 25 11:11:42 2018 +0200

--
 deltaspike/modules/data/test-ee7/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62bec4d/deltaspike/modules/data/test-ee7/pom.xml
--
diff --git a/deltaspike/modules/data/test-ee7/pom.xml 
b/deltaspike/modules/data/test-ee7/pom.xml
index f89b099..db751a8 100644
--- a/deltaspike/modules/data/test-ee7/pom.xml
+++ b/deltaspike/modules/data/test-ee7/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.deltaspike.modules
 data-module-project
-1.9.0-SNAPSHOT
+1.9.1-SNAPSHOT
 
 
 deltaspike-data-module-test-ee7

[3/3] deltaspike git commit: DELTASPIKE-1338 tests for @TestControl#classFilter

[gpetracek]

DELTASPIKE-1338 tests for @TestControl#classFilter


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9429dd07
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9429dd07
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9429dd07

Branch: refs/heads/deltaspike-1.8.x
Commit: 9429dd07ce38359d905b30f86a5cfbe9a108841b
Parents: 3f219d6
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 15:13:44 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:24:14 2018 +0200

--
 .../testcontrol/uc019/DefaultTestService.java   | 31 ++
 .../testcontrol/uc019/TestBeanClassFilter.java  | 65 
 .../test/testcontrol/uc019/TestLabeled.java | 34 ++
 .../uc019/TestLabeledAlternativeFilter.java | 56 +
 .../test/testcontrol/uc019/TestService.java | 24 
 .../testcontrol/uc019/TestServiceLabelX.java| 34 ++
 .../uc019/TestServiceLabelXTest.java| 61 ++
 .../testcontrol/uc019/TestServiceLabelY.java| 34 ++
 .../uc019/TestServiceLabelYTest.java| 61 ++
 .../META-INF/apache-deltaspike.properties   |  3 +
 .../impl/src/test/resources/META-INF/beans.xml  |  4 ++
 11 files changed, 407 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9429dd07/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
new file mode 100644
index 000..ea153a2
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.testcontrol.uc019;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class DefaultTestService implements TestService
+{
+@Override
+public String getValue()
+{
+return "default-result";
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9429dd07/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
new file mode 100644
index 000..4953f3e
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.testcontrol.uc019;

[1/3] deltaspike git commit: DELTASPIKE-1337 optional ClassFilter

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/deltaspike-1.8.x 8a131ed14 -> 9429dd07c


DELTASPIKE-1337 optional ClassFilter


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f7c12d72
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f7c12d72
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f7c12d72

Branch: refs/heads/deltaspike-1.8.x
Commit: f7c12d726216fcdb47a5ec0b25314cd14aca723c
Parents: 8a131ed
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 13:07:28 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:23:50 2018 +0200

--
 .../deltaspike/core/spi/filter/ClassFilter.java | 26 +++
 .../exclude/extension/ExcludeExtension.java | 45 +---
 2 files changed, 64 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f7c12d72/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
new file mode 100644
index 000..6a891da
--- /dev/null
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.spi.filter;
+
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+
+public interface ClassFilter extends Deactivatable
+{
+boolean isFiltered(Class currentClass);
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f7c12d72/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index ade000d..183d1d9 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -18,21 +18,23 @@
  */
 package org.apache.deltaspike.core.impl.exclude.extension;
 
+import org.apache.deltaspike.core.api.config.ConfigResolver;
 import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
 import org.apache.deltaspike.core.api.exclude.Exclude;
-import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
-import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
-import org.apache.deltaspike.core.util.ServiceUtils;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
-import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.spi.filter.ClassFilter;
 import org.apache.deltaspike.core.api.interpreter.ExpressionInterpreter;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
+import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
 import 
org.apache.deltaspike.core.impl.interpreter.PropertyExpressionInterpreter;
+import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
 import org.apache.deltaspike.core.util.ClassDeactivationUtils;
 import org.apache.deltaspike.core.util.ClassUtils;
 import org.apache.deltaspike.core

[2/3] deltaspike git commit: DELTASPIKE-1338 support for ClassFilter per @TestControl test

[gpetracek]

DELTASPIKE-1338 support for ClassFilter per @TestControl test


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3f219d6f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3f219d6f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3f219d6f

Branch: refs/heads/deltaspike-1.8.x
Commit: 3f219d6fbf87186edcd934848bff80ae608a6af7
Parents: f7c12d7
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 15:12:56 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:24:02 2018 +0200

--
 .../deltaspike/testcontrol/api/TestControl.java |  9 +
 .../testcontrol/api/junit/CdiTestRunner.java|  2 +-
 .../api/junit/CdiTestSuiteRunner.java   | 40 
 .../api/literal/TestControlLiteral.java |  7 
 4 files changed, 50 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3f219d6f/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
index 5753250..7885fb2 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
@@ -18,6 +18,7 @@
  */
 package org.apache.deltaspike.testcontrol.api;
 
+import org.apache.deltaspike.core.spi.filter.ClassFilter;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
 
 import java.lang.annotation.Annotation;
@@ -64,6 +65,14 @@ public @interface TestControl
  */
 Class activeAlternativeLabel() default Label.class;
 
+//with cdi 1.1+ it can be used to implement labeled-alternatives without 
text based config
+//(details see DELTASPIKE-1338)
+/**
+ * low-level filter (mainly needed for special cases if 
labeled-alternatives aren't enough)
+ * @return the class-filter class which should be used for the current 
test-class
+ */
+Class classFilter() default ClassFilter.class;
+
 interface Label
 {
 }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3f219d6f/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index f50650c..11be0d4 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -467,7 +467,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 // Note that Weld 1 was "flat" anyway, so this property 
only affects newer versions of Weld
 System.setProperty("org.jboss.weld.se.archive.isolation", 
"false");
 
-CdiTestSuiteRunner.applyAlternativeLabel(testClass);
+CdiTestSuiteRunner.applyTestSpecificMetaData(testClass);
 
 
container.boot(CdiTestSuiteRunner.getTestContainerConfig());
 setContainerStarted();

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3f219d6f/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
index bfe0b45..5a31765 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
@@ -22,6 +22,7 @@ import org.apache.deltaspike.cdise.api.CdiContainer;
 import org.apache.deltaspike.cdise.api.CdiContainerLoader;
 import org.apache.deltaspike.core.api.config.ConfigResolver;
 import org.apache.deltaspike.core.api.config.PropertyLoader;
+import org.apa

[1/4] deltaspike git commit: DELTASPIKE-1338 tests for @TestControl#classFilter

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master aabbc879e -> 6475f49ce


DELTASPIKE-1338 tests for @TestControl#classFilter


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6475f49c
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6475f49c
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6475f49c

Branch: refs/heads/master
Commit: 6475f49ce82cf568430792b81b58117e41423b17
Parents: 1c18704
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 15:13:44 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:22:40 2018 +0200

--
 .../testcontrol/uc019/DefaultTestService.java   | 31 ++
 .../testcontrol/uc019/TestBeanClassFilter.java  | 65 
 .../test/testcontrol/uc019/TestLabeled.java | 34 ++
 .../uc019/TestLabeledAlternativeFilter.java | 56 +
 .../test/testcontrol/uc019/TestService.java | 24 
 .../testcontrol/uc019/TestServiceLabelX.java| 34 ++
 .../uc019/TestServiceLabelXTest.java| 61 ++
 .../testcontrol/uc019/TestServiceLabelY.java| 34 ++
 .../uc019/TestServiceLabelYTest.java| 61 ++
 .../META-INF/apache-deltaspike.properties   |  3 +
 .../impl/src/test/resources/META-INF/beans.xml  |  4 ++
 11 files changed, 407 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6475f49c/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
new file mode 100644
index 000..ea153a2
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/DefaultTestService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.testcontrol.uc019;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class DefaultTestService implements TestService
+{
+@Override
+public String getValue()
+{
+return "default-result";
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6475f49c/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
new file mode 100644
index 000..4953f3e
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc019/TestBeanClassFilter.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing

[2/4] deltaspike git commit: DELTASPIKE-1337 optional ClassFilter

[gpetracek]

DELTASPIKE-1337 optional ClassFilter


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b7808929
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b7808929
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b7808929

Branch: refs/heads/master
Commit: b7808929786eee130e9a724390ff148644d0b127
Parents: a67888d
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 13:07:28 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:22:40 2018 +0200

--
 .../deltaspike/core/spi/filter/ClassFilter.java | 26 +++
 .../exclude/extension/ExcludeExtension.java | 45 +---
 2 files changed, 64 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b7808929/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
new file mode 100644
index 000..6a891da
--- /dev/null
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.spi.filter;
+
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+
+public interface ClassFilter extends Deactivatable
+{
+boolean isFiltered(Class currentClass);
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b7808929/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index ade000d..183d1d9 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -18,21 +18,23 @@
  */
 package org.apache.deltaspike.core.impl.exclude.extension;
 
+import org.apache.deltaspike.core.api.config.ConfigResolver;
 import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
 import org.apache.deltaspike.core.api.exclude.Exclude;
-import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
-import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
-import org.apache.deltaspike.core.util.ServiceUtils;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
-import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.spi.filter.ClassFilter;
 import org.apache.deltaspike.core.api.interpreter.ExpressionInterpreter;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
+import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
 import 
org.apache.deltaspike.core.impl.interpreter.PropertyExpressionInterpreter;
+import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
 import org.apache.deltaspike.core.util.ClassDeactivationUtils;
 import org.apache.deltaspike.core.util.ClassUtils;
 import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.core.util.ServiceUtils;
+import org.apache.deltaspike.core.util.metad

[4/4] deltaspike git commit: DELTASPIKE-1322 cleanup

[gpetracek]

DELTASPIKE-1322 cleanup


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a67888d4
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a67888d4
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a67888d4

Branch: refs/heads/master
Commit: a67888d4b666f0b492c1e410fa96056eec5f54ba
Parents: aabbc87
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 12:03:20 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:22:40 2018 +0200

--
 .../core/api/config/ConfigResolver.java | 22 
 1 file changed, 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a67888d4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
index fe05771..fdb8245 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
@@ -21,14 +21,12 @@ package org.apache.deltaspike.core.api.config;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
 
 import javax.enterprise.inject.Typed;
 
@@ -67,9 +65,6 @@ public final class ConfigResolver
  */
 public static final String DELTASPIKE_LOG_CONFIG = "deltaspike.config.log";
 
-
-private static final Logger LOG = 
Logger.getLogger(ConfigResolver.class.getName());
-
 private static ConfigProvider configProvider;
 
 private ConfigResolver()
@@ -369,23 +364,6 @@ public final class ConfigResolver
 return getConfigProvider().getConfig().getConfigSources();
 }
 
-private static List sortAscending(List 
configSources)
-{
-Collections.sort(configSources, new Comparator()
-{
-/**
- * {@inheritDoc}
- */
-@Override
-public int compare(ConfigSource configSource1, ConfigSource 
configSource2)
-{
-return (configSource1.getOrdinal() > 
configSource2.getOrdinal()) ? 1 : -1;
-}
-});
-return configSources;
-}
-
-
 /**
  * Filter the configured value.
  * This can e.g. be used for decryption.

[3/4] deltaspike git commit: DELTASPIKE-1338 support for ClassFilter per @TestControl test

[gpetracek]

DELTASPIKE-1338 support for ClassFilter per @TestControl test


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1c187042
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1c187042
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1c187042

Branch: refs/heads/master
Commit: 1c187042577258360680de517151d748807ff6c8
Parents: b780892
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 20 15:12:56 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 20 15:22:40 2018 +0200

--
 .../deltaspike/testcontrol/api/TestControl.java |  9 +
 .../testcontrol/api/junit/CdiTestRunner.java|  2 +-
 .../api/junit/CdiTestSuiteRunner.java   | 40 
 .../api/literal/TestControlLiteral.java |  7 
 4 files changed, 50 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1c187042/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
index 5753250..7885fb2 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java
@@ -18,6 +18,7 @@
  */
 package org.apache.deltaspike.testcontrol.api;
 
+import org.apache.deltaspike.core.spi.filter.ClassFilter;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
 
 import java.lang.annotation.Annotation;
@@ -64,6 +65,14 @@ public @interface TestControl
  */
 Class activeAlternativeLabel() default Label.class;
 
+//with cdi 1.1+ it can be used to implement labeled-alternatives without 
text based config
+//(details see DELTASPIKE-1338)
+/**
+ * low-level filter (mainly needed for special cases if 
labeled-alternatives aren't enough)
+ * @return the class-filter class which should be used for the current 
test-class
+ */
+Class classFilter() default ClassFilter.class;
+
 interface Label
 {
 }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1c187042/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index f50650c..11be0d4 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -467,7 +467,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 // Note that Weld 1 was "flat" anyway, so this property 
only affects newer versions of Weld
 System.setProperty("org.jboss.weld.se.archive.isolation", 
"false");
 
-CdiTestSuiteRunner.applyAlternativeLabel(testClass);
+CdiTestSuiteRunner.applyTestSpecificMetaData(testClass);
 
 
container.boot(CdiTestSuiteRunner.getTestContainerConfig());
 setContainerStarted();

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1c187042/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
index bfe0b45..5a31765 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
@@ -22,6 +22,7 @@ import org.apache.deltaspike.cdise.api.CdiContainer;
 import org.apache.deltaspike.cdise.api.CdiContainerLoader;
 import org.apache.deltaspike.core.api.config.ConfigResolver;
 import org.apache.deltaspike.core.api.config.PropertyLoader;
+import org.apache.delta

deltaspike git commit: DELTASPIKE-1319 additional tests for labeled alternatives

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/deltaspike-1.8.x a360578bd -> 8a131ed14


DELTASPIKE-1319 additional tests for labeled alternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8a131ed1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8a131ed1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8a131ed1

Branch: refs/heads/deltaspike-1.8.x
Commit: 8a131ed14c3c51da13d1fce56892e2c1edfe8053
Parents: a360578
Author: gpetracek <gpetra...@apache.org>
Authored: Mon Apr 16 21:27:15 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon Apr 16 22:26:32 2018 +0200

--
 .../testcontrol/uc017/DefaultServiceTest.java   | 44 +
 .../uc017/DefaultTestServiceProducer.java   | 40 
 .../testcontrol/uc017/LabeledServiceTest.java   | 50 
 .../uc017/LabeledTestServiceProducer.java   | 41 
 .../test/testcontrol/uc017/TestService.java | 24 ++
 .../testcontrol/uc018/DefaultServiceTest.java   | 44 +
 .../uc018/DefaultTestServiceProducer.java   | 38 +++
 .../uc018/InterceptedDefaultTestService.java| 35 ++
 .../uc018/InterceptedLabeledTestService.java| 35 ++
 .../uc018/InterceptedTestService.java   | 24 ++
 .../uc018/InterceptedTestServiceProducer.java   | 24 ++
 .../testcontrol/uc018/LabeledServiceTest.java   | 50 
 .../uc018/LabeledTestServiceProducer.java   | 40 
 .../testcontrol/uc018/TestServiceQualifier.java | 38 +++
 .../uc018/TestUpperCaseInterceptor.java | 31 
 .../TestUpperCaseInterceptorImplementation.java | 41 
 .../META-INF/apache-deltaspike.properties   |  3 ++
 .../impl/src/test/resources/META-INF/beans.xml  |  1 +
 18 files changed, 603 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8a131ed1/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
new file mode 100644
index 000..9fa7a40
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.testcontrol.uc017;
+
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+@RunWith(CdiTestRunner.class)
+public class DefaultServiceTest
+{
+@Inject
+private TestService testService;
+
+@Test
+public void defaultValue()
+{
+Assert.assertEquals("default-result", testService.getValue());
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8a131ed1/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultTestServiceProducer.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultTestServiceProducer.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultTestServiceProducer.java
new file mode 100644
index 000..ce3be60
--- /dev/nul

deltaspike git commit: DELTASPIKE-1319 additional tests for labeled alternatives

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 20d4741de -> 463a8c9b8


DELTASPIKE-1319 additional tests for labeled alternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/463a8c9b
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/463a8c9b
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/463a8c9b

Branch: refs/heads/master
Commit: 463a8c9b81f4ce3a1c64565748e25f72eeba7988
Parents: 20d4741
Author: gpetracek <gpetra...@apache.org>
Authored: Mon Apr 16 21:27:15 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon Apr 16 22:13:16 2018 +0200

--
 .../testcontrol/uc017/DefaultServiceTest.java   | 44 +
 .../uc017/DefaultTestServiceProducer.java   | 40 
 .../testcontrol/uc017/LabeledServiceTest.java   | 50 
 .../uc017/LabeledTestServiceProducer.java   | 41 
 .../test/testcontrol/uc017/TestService.java | 24 ++
 .../testcontrol/uc018/DefaultServiceTest.java   | 44 +
 .../uc018/DefaultTestServiceProducer.java   | 38 +++
 .../uc018/InterceptedDefaultTestService.java| 35 ++
 .../uc018/InterceptedLabeledTestService.java| 35 ++
 .../uc018/InterceptedTestService.java   | 24 ++
 .../uc018/InterceptedTestServiceProducer.java   | 24 ++
 .../testcontrol/uc018/LabeledServiceTest.java   | 50 
 .../uc018/LabeledTestServiceProducer.java   | 40 
 .../testcontrol/uc018/TestServiceQualifier.java | 38 +++
 .../uc018/TestUpperCaseInterceptor.java | 31 
 .../TestUpperCaseInterceptorImplementation.java | 41 
 .../META-INF/apache-deltaspike.properties   |  3 ++
 .../impl/src/test/resources/META-INF/beans.xml  |  1 +
 18 files changed, 603 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/463a8c9b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
new file mode 100644
index 000..9fa7a40
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultServiceTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.testcontrol.uc017;
+
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+@RunWith(CdiTestRunner.class)
+public class DefaultServiceTest
+{
+@Inject
+private TestService testService;
+
+@Test
+public void defaultValue()
+{
+Assert.assertEquals("default-result", testService.getValue());
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/463a8c9b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultTestServiceProducer.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultTestServiceProducer.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc017/DefaultTestServiceProducer.java
new file mode 100644
index 000..ce3be60
--- /dev/null
+++ 
b/deltaspik

deltaspike git commit: DELTASPIKE-1332 backported tests

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/deltaspike-1.8.x 553cbaf65 -> 3b959179a


DELTASPIKE-1332 backported tests


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3b959179
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3b959179
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3b959179

Branch: refs/heads/deltaspike-1.8.x
Commit: 3b959179ad7d880f8b1c479adf3fb3f42e85e67b
Parents: 553cbaf
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Apr 3 00:20:21 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Apr 3 00:20:21 2018 +0200

--
 .../test/jsf/impl/config/view/custom/uc008/ViewConfigTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3b959179/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/ViewConfigTest.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/ViewConfigTest.java
 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/ViewConfigTest.java
index 9b9508e..4b7 100644
--- 
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/ViewConfigTest.java
+++ 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/ViewConfigTest.java
@@ -54,7 +54,7 @@ public class ViewConfigTest
 @Test
 public void testMetaDataTree()
 {
-List<Class> menuViewConfigClasses = new 
ArrayList<>();
+List<Class> menuViewConfigClasses = new 
ArrayList<Class>();
 menuViewConfigClasses.add(Pages.Section1.Content1.class);
 menuViewConfigClasses.add(Pages.Section1.Content2.class);
 menuViewConfigClasses.add(Pages.Section2.Content1.class);
@@ -85,7 +85,7 @@ public class ViewConfigTest
 @Test
 public void testViewConfig()
 {
-List<Class> menuViewConfigClasses = new 
ArrayList<>();
+List<Class> menuViewConfigClasses = new 
ArrayList<Class>();
 menuViewConfigClasses.add(Pages.Section1.Content1.class);
 menuViewConfigClasses.add(Pages.Section1.Content2.class);
 menuViewConfigClasses.add(Pages.Section2.Content1.class);

deltaspike git commit: DELTASPIKE-1332 added tests

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/deltaspike-1.8.x 45b3e3e84 -> 553cbaf65


DELTASPIKE-1332 added tests


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/553cbaf6
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/553cbaf6
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/553cbaf6

Branch: refs/heads/deltaspike-1.8.x
Commit: 553cbaf6571c922c8d79cc70b48f9a7cd480d390
Parents: 45b3e3e
Author: gpetracek <gpetra...@apache.org>
Authored: Mon Apr 2 23:43:39 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon Apr 2 23:52:26 2018 +0200

--
 .../impl/config/view/custom/uc008/Pages.java|  56 +
 .../config/view/custom/uc008/TestMenuEntry.java |  36 ++
 .../view/custom/uc008/ViewConfigTest.java   | 114 +++
 3 files changed, 206 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/553cbaf6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
new file mode 100644
index 000..53a08f1
--- /dev/null
+++ 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.custom.uc008;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+interface Pages extends ViewConfig
+{
+class Index implements Pages
+{
+}
+
+@TestMenuEntry(pos = 1)
+interface Section1 extends Pages
+{
+@TestMenuEntry(pos = 1)
+class Content1 implements Section1
+{
+}
+
+@TestMenuEntry(pos =2)
+class Content2 implements Section1
+{
+}
+}
+
+@TestMenuEntry(pos = 2)
+interface Section2 extends Pages
+{
+@TestMenuEntry(pos = 1)
+class Content1 implements Section2
+{
+}
+
+@TestMenuEntry(pos =2)
+class Content2 implements Section2
+{
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/553cbaf6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
new file mode 100644
index 000..7fa0d22
--- /dev/null
+++ 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.delta

deltaspike git commit: DELTASPIKE-1332 added tests

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 1c8bd4bdf -> 0ccd9d436


DELTASPIKE-1332 added tests


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0ccd9d43
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0ccd9d43
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0ccd9d43

Branch: refs/heads/master
Commit: 0ccd9d436ae9b5cb3f7c726e035be8ab78c90616
Parents: 1c8bd4b
Author: gpetracek <gpetra...@apache.org>
Authored: Mon Apr 2 23:43:39 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon Apr 2 23:49:35 2018 +0200

--
 .../impl/config/view/custom/uc008/Pages.java|  56 +
 .../config/view/custom/uc008/TestMenuEntry.java |  36 ++
 .../view/custom/uc008/ViewConfigTest.java   | 114 +++
 3 files changed, 206 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0ccd9d43/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
new file mode 100644
index 000..53a08f1
--- /dev/null
+++ 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/Pages.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.custom.uc008;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+interface Pages extends ViewConfig
+{
+class Index implements Pages
+{
+}
+
+@TestMenuEntry(pos = 1)
+interface Section1 extends Pages
+{
+@TestMenuEntry(pos = 1)
+class Content1 implements Section1
+{
+}
+
+@TestMenuEntry(pos =2)
+class Content2 implements Section1
+{
+}
+}
+
+@TestMenuEntry(pos = 2)
+interface Section2 extends Pages
+{
+@TestMenuEntry(pos = 1)
+class Content1 implements Section2
+{
+}
+
+@TestMenuEntry(pos =2)
+class Content2 implements Section2
+{
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0ccd9d43/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
new file mode 100644
index 000..7fa0d22
--- /dev/null
+++ 
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/custom/uc008/TestMenuEntry.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.delta

deltaspike git commit: DELTASPIKE-1332 support custom view-meta-data without default-values for primitive data-types

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/deltaspike-1.8.x 1785e0ff4 -> 45b3e3e84


DELTASPIKE-1332 support custom view-meta-data without default-values for 
primitive data-types


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/45b3e3e8
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/45b3e3e8
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/45b3e3e8

Branch: refs/heads/deltaspike-1.8.x
Commit: 45b3e3e844b7730ffc76cf0ab55049178ef943e7
Parents: 1785e0f
Author: gpetracek <gpetra...@apache.org>
Authored: Mon Apr 2 23:06:56 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon Apr 2 23:09:51 2018 +0200

--
 .../jsf/impl/config/view/DefaultConfigNodeConverter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/45b3e3e8/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
index 8851592..e198fa7 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
@@ -198,7 +198,7 @@ public class DefaultConfigNodeConverter implements 
ConfigNodeConverter
 {
 defaultValue = annotationMethod.invoke(defaultAnnotation);
 }
-catch (NullPointerException e) //happens with primitive 
data-types without default values
+catch (Exception e) //happens with primitive data-types 
without default values
 {
 defaultValue = null;
 }

deltaspike git commit: DELTASPIKE-1332 support custom view-meta-data without default-values for primitive data-types

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master b194bca4c -> 1c8bd4bdf


DELTASPIKE-1332 support custom view-meta-data without default-values for 
primitive data-types


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1c8bd4bd
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1c8bd4bd
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1c8bd4bd

Branch: refs/heads/master
Commit: 1c8bd4bdfd2ebc2688c67f9c703cc2036fde92c5
Parents: b194bca
Author: gpetracek <gpetra...@apache.org>
Authored: Mon Apr 2 23:06:56 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon Apr 2 23:06:56 2018 +0200

--
 .../jsf/impl/config/view/DefaultConfigNodeConverter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1c8bd4bd/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
index 8851592..e198fa7 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
@@ -198,7 +198,7 @@ public class DefaultConfigNodeConverter implements 
ConfigNodeConverter
 {
 defaultValue = annotationMethod.invoke(defaultAnnotation);
 }
-catch (NullPointerException e) //happens with primitive 
data-types without default values
+catch (Exception e) //happens with primitive data-types 
without default values
 {
 defaultValue = null;
 }

[3/7] deltaspike git commit: DELTASPIKE-1319 basic support for test-suites and minor improvements

[gpetracek]

DELTASPIKE-1319 basic support for test-suites and minor improvements


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a2591c49
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a2591c49
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a2591c49

Branch: refs/heads/deltaspike-1.8.x
Commit: a2591c497f9f6f00c84b70d7a9f0b92b431e456e
Parents: e0a2505
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Mar 1 21:50:11 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:36:35 2018 +0200

--
 .../testcontrol/api/junit/CdiTestRunner.java|  41 +--
 .../api/junit/CdiTestSuiteRunner.java   | 122 +++
 2 files changed, 124 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a2591c49/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index c855b40..f50650c 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -50,7 +50,6 @@ import javax.enterprise.context.SessionScoped;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Named;
 import javax.inject.Singleton;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -468,7 +467,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 // Note that Weld 1 was "flat" anyway, so this property 
only affects newer versions of Weld
 System.setProperty("org.jboss.weld.se.archive.isolation", 
"false");
 
-checkForLabeledAlternativeConfig(testClass);
+CdiTestSuiteRunner.applyAlternativeLabel(testClass);
 
 
container.boot(CdiTestSuiteRunner.getTestContainerConfig());
 setContainerStarted();
@@ -493,43 +492,6 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 startScopes(container, testClass, null, 
restrictedScopes.toArray(new Class[restrictedScopes.size()]));
 }
 
-private void checkForLabeledAlternativeConfig(Class testClass)
-{
-String activeAlternativeLabel = "";
-TestControl testControl = 
testClass.getAnnotation(TestControl.class);
-
-if (testControl != null)
-{
-Class activeTypedAlternativeLabel 
=
-testControl.activeAlternativeLabel();
-
-if 
(!TestControl.Label.class.equals(activeTypedAlternativeLabel))
-{
-Named labelName = 
activeTypedAlternativeLabel.getAnnotation(Named.class);
-
-if (labelName != null)
-{
-activeAlternativeLabel = labelName.value();
-}
-else
-{
-String labelClassName = 
activeTypedAlternativeLabel.getSimpleName();
-activeAlternativeLabel = labelClassName.substring(0, 
1).toLowerCase();
-
-if (labelClassName.length() > 1)
-{
-activeAlternativeLabel += 
labelClassName.substring(1);
-}
-}
-}
-}
-//always set it even if it is empty (it might overrule the value 
of the prev. test
-System.setProperty("activeAlternativeLabel", 
activeAlternativeLabel); //will be picked up by ds-core
-
-//TODO discuss a spi which allows to run such tests in parallel
-System.setProperty("activeAlternativeLabelSource", 
testClass.getName()); //can be used for custom logic
-}
-
 private void bootExternalContainers(Class testClass)
 {
 if (!this.testControl.startExternalContainers())
@@ -886,4 +848,5 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 
 return 
Collections.unmodifiableList(cdiTestRunner.testContext.externalContainers);
 }
+
 }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a2591c49/deltaspike/modules/test-control/api/src/ma

[5/7] deltaspike git commit: DELTASPIKE-1331 improved method signature of ViewConfigNode#getSource

[gpetracek]

DELTASPIKE-1331 improved method signature of ViewConfigNode#getSource


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/add0adf3
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/add0adf3
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/add0adf3

Branch: refs/heads/deltaspike-1.8.x
Commit: add0adf311d260b9e727e172d5248161bdc62d16
Parents: 5892839
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Mar 23 23:21:38 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:37:18 2018 +0200

--
 .../apache/deltaspike/core/spi/config/view/ViewConfigNode.java | 2 +-
 .../jsf/impl/config/view/DefaultConfigNodeConverter.java   | 2 +-
 .../deltaspike/jsf/impl/config/view/FolderConfigNode.java  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/add0adf3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
index 3aa7e72..64b70f3 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
@@ -34,7 +34,7 @@ public interface ViewConfigNode
 
 List getChildren();
 
-Class getSource();
+Class getSource();
 
 Set getMetaData();
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/add0adf3/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
index c25d742..44682cb 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
@@ -67,7 +67,7 @@ public class DefaultConfigNodeConverter implements 
ConfigNodeConverter
 {
 View viewAnnotation = findMetaDataByType(mergedMetaData, 
View.class);
 String viewId = viewAnnotation.basePath() + viewAnnotation.name() 
+ "." + viewAnnotation.extension();
-return new DefaultViewPathConfigDescriptor(viewId, 
node.getSource(),
+return new DefaultViewPathConfigDescriptor(viewId, (Class) node.getSource(),
 filterInheritedFolderMetaData(mergedMetaData), 
node.getCallbackDescriptors());
 }
 else

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/add0adf3/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
index 3a357c7..85ccf9e 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
@@ -29,9 +29,9 @@ import java.util.Set;
 public class FolderConfigNode extends AbstractConfigNode
 {
 //not all interfaces have to implement the ViewConfig interface
-private final Class nodeId;
+private final Class nodeId;
 
-public FolderConfigNode(Class nodeId, ViewConfigNode parent, 
Set nodeMetaData)
+public FolderConfigNode(Class nodeId, ViewConfigNode parent, 
Set nodeMetaData)
 {
 super(parent, nodeMetaData);
 this.nodeId = nodeId;
@@ -55,7 +55,7 @@ public class FolderConfigNode extends AbstractConfigNode
 }
 
 @Override
-public Class getSource()
+public Class getSource()
 {
 return this.nodeId;
 }

[1/7] deltaspike git commit: DELTASPIKE-1320 detect conflicts in globalAlternatives

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/deltaspike-1.8.x f06a78939 -> 1785e0ff4


DELTASPIKE-1320 detect conflicts in globalAlternatives

labeled Alternatives take precendence over globalAlternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/06fd261a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/06fd261a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/06fd261a

Branch: refs/heads/deltaspike-1.8.x
Commit: 06fd261a76e5ad8e791fd0fd4dd2994614f062ec
Parents: f06a789
Author: Mark Struberg <strub...@apache.org>
Authored: Thu Mar 1 07:28:04 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:35:14 2018 +0200

--
 ...lAwareGlobalAlternativeBeanClassProvider.java | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/06fd261a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
index adad429..8a2ddf7 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
@@ -48,26 +48,32 @@ public class LabelAwareGlobalAlternativeBeanClassProvider 
implements Alternative
 }
 
 Map<String, String> allProperties = ConfigResolver.getAllProperties();
+// first read all globalAlternatives
 for (Map.Entry<String, String> property : allProperties.entrySet())
 {
-if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
+if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
 {
-String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
+String interfaceName = 
property.getKey().substring(GLOBAL_ALTERNATIVES.length());
 String implementation = property.getValue();
 if (LOG.isLoggable(Level.FINE))
 {
-LOG.fine("Enabling labeled alternative for interface " + 
interfaceName + ": " + implementation);
+LOG.fine("Enabling global alternative for interface " + 
interfaceName + ": " + implementation);
 }
 
 result.put(interfaceName, implementation);
 }
-else if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
+}
+
+// and overwrite with any possible labled alternative, if exists
+for (Map.Entry<String, String> property : allProperties.entrySet())
+{
+if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
 {
-String interfaceName = 
property.getKey().substring(GLOBAL_ALTERNATIVES.length());
+String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
 String implementation = property.getValue();
 if (LOG.isLoggable(Level.FINE))
 {
-LOG.fine("Enabling global alternative for interface " + 
interfaceName + ": " + implementation);
+LOG.fine("Enabling labeled alternative for interface " + 
interfaceName + ": " + implementation);
 }
 
 result.put(interfaceName, implementation);
@@ -76,4 +82,5 @@ public class LabelAwareGlobalAlternativeBeanClassProvider 
implements Alternative
 
 return result;
 }
+
 }

[6/7] deltaspike git commit: DELTASPIKE-1332 support custom view-meta-data without default-values for primitive data-types

[gpetracek]

DELTASPIKE-1332 support custom view-meta-data without default-values for 
primitive data-types


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/45dba462
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/45dba462
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/45dba462

Branch: refs/heads/deltaspike-1.8.x
Commit: 45dba462b8f16d86e3246bc28910fb241ef332e1
Parents: add0adf
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Mar 23 23:34:24 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:37:55 2018 +0200

--
 .../impl/config/view/DefaultConfigNodeConverter.java| 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/45dba462/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
index 44682cb..8851592 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
@@ -192,7 +192,17 @@ public class DefaultConfigNodeConverter implements 
ConfigNodeConverter
 Annotation defaultAnnotation = 
AnnotationInstanceProvider.of(existingMetaData.annotationType());
 try
 {
-Object defaultValue = 
annotationMethod.invoke(defaultAnnotation);
+Object defaultValue = null;
+
+try
+{
+defaultValue = annotationMethod.invoke(defaultAnnotation);
+}
+catch (NullPointerException e) //happens with primitive 
data-types without default values
+{
+defaultValue = null;
+}
+
 Object existingValue = 
annotationMethod.invoke(existingMetaData);
 
 if (existingValue == null /*possible with literal instances*/ 
||

[4/7] deltaspike git commit: DELTASPIKE-1329 log update of project-stage value

[gpetracek]

DELTASPIKE-1329 log update of project-stage value


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5892839f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5892839f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5892839f

Branch: refs/heads/deltaspike-1.8.x
Commit: 5892839f1d0e52a17b4672eda27ccb10687cc03b
Parents: a2591c4
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Mar 17 19:11:48 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:36:56 2018 +0200

--
 .../apache/deltaspike/core/util/ProjectStageProducer.java   | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5892839f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index b79be81..4d30f00 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -214,6 +214,15 @@ public class ProjectStageProducer implements Serializable
  */
 public static void setProjectStage(ProjectStage ps)
 {
+if (projectStage != null)
+{
+LOG.info("change project-stage from " + projectStage + " to " + 
ps);
+}
+else
+{
+LOG.info("change project-stage to " + ps);
+}
+
 projectStage = ps;
 }
 }

[2/7] deltaspike git commit: DELTASPIKE-1320 labeled alternatives take priority over global alternatives

[gpetracek]

DELTASPIKE-1320 labeled alternatives take priority over global alternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/e0a25055
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/e0a25055
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/e0a25055

Branch: refs/heads/deltaspike-1.8.x
Commit: e0a2505580dea6d2d95d9677a0f1ec686ce398f4
Parents: 06fd261
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Mar 1 09:09:15 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:35:52 2018 +0200

--
 ...AwareGlobalAlternativeBeanClassProvider.java | 24 
 1 file changed, 10 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e0a25055/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
index 8a2ddf7..9d7d296 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
@@ -48,39 +48,35 @@ public class LabelAwareGlobalAlternativeBeanClassProvider 
implements Alternative
 }
 
 Map<String, String> allProperties = ConfigResolver.getAllProperties();
-// first read all globalAlternatives
 for (Map.Entry<String, String> property : allProperties.entrySet())
 {
-if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
+if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
 {
-String interfaceName = 
property.getKey().substring(GLOBAL_ALTERNATIVES.length());
+String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
 String implementation = property.getValue();
 if (LOG.isLoggable(Level.FINE))
 {
-LOG.fine("Enabling global alternative for interface " + 
interfaceName + ": " + implementation);
+LOG.fine("Enabling labeled alternative for interface " + 
interfaceName + ": " + implementation);
 }
 
 result.put(interfaceName, implementation);
 }
-}
-
-// and overwrite with any possible labled alternative, if exists
-for (Map.Entry<String, String> property : allProperties.entrySet())
-{
-if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
+else if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
 {
-String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
+String interfaceName = 
property.getKey().substring(GLOBAL_ALTERNATIVES.length());
 String implementation = property.getValue();
 if (LOG.isLoggable(Level.FINE))
 {
-LOG.fine("Enabling labeled alternative for interface " + 
interfaceName + ": " + implementation);
+LOG.fine("Enabling global alternative for interface " + 
interfaceName + ": " + implementation);
 }
 
-result.put(interfaceName, implementation);
+if (!result.containsKey(interfaceName)) //don't override 
labeled alternatives
+{
+result.put(interfaceName, implementation);
+}
 }
 }
 
 return result;
 }
-
 }

[7/7] deltaspike git commit: DELTASPIKE-1334 added javadoc for ConfigPreProcessor#beforeAddToConfig

[gpetracek]

DELTASPIKE-1334 added javadoc for ConfigPreProcessor#beforeAddToConfig


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1785e0ff
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1785e0ff
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1785e0ff

Branch: refs/heads/deltaspike-1.8.x
Commit: 1785e0ff44d3f58c64cda0b257bdf0c23d7f40b0
Parents: 45dba46
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Mar 29 23:19:38 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:38:24 2018 +0200

--
 .../core/spi/config/view/ConfigPreProcessor.java| 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1785e0ff/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
index 1cce3a4..3d9f4b6 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
@@ -30,5 +30,17 @@ import java.lang.annotation.Annotation;
  */
 public interface ConfigPreProcessor
 {
+/**
+ * @param metaData The annotation-instance which was found or the 
inherited instance.
+ * Since it's possible to override annotation-attributes 
alongside the inheritance-path,
+ * it can be a merged representation.
+ * To get rid of meta-data which is only inherited,
+ * it's required to check the presence of the physical 
annotation e.g. via
+ * ViewConfigNode#getSource#isAnnotationPresent
+ * and return a synthetic literal-instance (as a 
marker/placeholder),
+ * because 'null' isn't supported as return-value.
+ * @param viewConfigNode Instance which represents the current node
+ * @return The annotation-instance which should be used for the final 
meta-data
+ */
 T beforeAddToConfig(T metaData, ViewConfigNode viewConfigNode);
 }

deltaspike git commit: DELTASPIKE-1334 added javadoc for ConfigPreProcessor#beforeAddToConfig

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 82596c574 -> b194bca4c


DELTASPIKE-1334 added javadoc for ConfigPreProcessor#beforeAddToConfig


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b194bca4
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b194bca4
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b194bca4

Branch: refs/heads/master
Commit: b194bca4cce763322185b65e833615cf5931821f
Parents: 82596c5
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Mar 29 23:19:38 2018 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 29 23:19:38 2018 +0200

--
 .../core/spi/config/view/ConfigPreProcessor.java| 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b194bca4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
index 1cce3a4..3d9f4b6 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ConfigPreProcessor.java
@@ -30,5 +30,17 @@ import java.lang.annotation.Annotation;
  */
 public interface ConfigPreProcessor
 {
+/**
+ * @param metaData The annotation-instance which was found or the 
inherited instance.
+ * Since it's possible to override annotation-attributes 
alongside the inheritance-path,
+ * it can be a merged representation.
+ * To get rid of meta-data which is only inherited,
+ * it's required to check the presence of the physical 
annotation e.g. via
+ * ViewConfigNode#getSource#isAnnotationPresent
+ * and return a synthetic literal-instance (as a 
marker/placeholder),
+ * because 'null' isn't supported as return-value.
+ * @param viewConfigNode Instance which represents the current node
+ * @return The annotation-instance which should be used for the final 
meta-data
+ */
 T beforeAddToConfig(T metaData, ViewConfigNode viewConfigNode);
 }

[1/2] deltaspike git commit: DELTASPIKE-1331 improved method signature of ViewConfigNode#getSource

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 138a061c3 -> 82596c574


DELTASPIKE-1331 improved method signature of ViewConfigNode#getSource


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/fe0106d4
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/fe0106d4
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/fe0106d4

Branch: refs/heads/master
Commit: fe0106d4a0ceaded2f6f38bdc83292de2b4f
Parents: 138a061
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Mar 23 23:21:38 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Mar 23 23:21:38 2018 +0100

--
 .../apache/deltaspike/core/spi/config/view/ViewConfigNode.java | 2 +-
 .../jsf/impl/config/view/DefaultConfigNodeConverter.java   | 2 +-
 .../deltaspike/jsf/impl/config/view/FolderConfigNode.java  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/fe0106d4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
index 3aa7e72..64b70f3 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java
@@ -34,7 +34,7 @@ public interface ViewConfigNode
 
 List getChildren();
 
-Class getSource();
+Class getSource();
 
 Set getMetaData();
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/fe0106d4/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
index c25d742..44682cb 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
@@ -67,7 +67,7 @@ public class DefaultConfigNodeConverter implements 
ConfigNodeConverter
 {
 View viewAnnotation = findMetaDataByType(mergedMetaData, 
View.class);
 String viewId = viewAnnotation.basePath() + viewAnnotation.name() 
+ "." + viewAnnotation.extension();
-return new DefaultViewPathConfigDescriptor(viewId, 
node.getSource(),
+return new DefaultViewPathConfigDescriptor(viewId, (Class) node.getSource(),
 filterInheritedFolderMetaData(mergedMetaData), 
node.getCallbackDescriptors());
 }
 else

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/fe0106d4/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
index 3a357c7..85ccf9e 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java
@@ -29,9 +29,9 @@ import java.util.Set;
 public class FolderConfigNode extends AbstractConfigNode
 {
 //not all interfaces have to implement the ViewConfig interface
-private final Class nodeId;
+private final Class nodeId;
 
-public FolderConfigNode(Class nodeId, ViewConfigNode parent, 
Set nodeMetaData)
+public FolderConfigNode(Class nodeId, ViewConfigNode parent, 
Set nodeMetaData)
 {
 super(parent, nodeMetaData);
 this.nodeId = nodeId;
@@ -55,7 +55,7 @@ public class FolderConfigNode extends AbstractConfigNode
 }
 
 @Override
-public Class getSource()
+public Class getSource()
 {
 return this.nodeId;
 }

[2/2] deltaspike git commit: DELTASPIKE-1332 support custom view-meta-data without default-values for primitive data-types

[gpetracek]

DELTASPIKE-1332 support custom view-meta-data without default-values for 
primitive data-types


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/82596c57
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/82596c57
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/82596c57

Branch: refs/heads/master
Commit: 82596c5749686ab5c747f191b1b8ee8359ae54d7
Parents: fe0106d
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Mar 23 23:34:24 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Mar 23 23:34:24 2018 +0100

--
 .../impl/config/view/DefaultConfigNodeConverter.java| 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82596c57/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
index 44682cb..8851592 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java
@@ -192,7 +192,17 @@ public class DefaultConfigNodeConverter implements 
ConfigNodeConverter
 Annotation defaultAnnotation = 
AnnotationInstanceProvider.of(existingMetaData.annotationType());
 try
 {
-Object defaultValue = 
annotationMethod.invoke(defaultAnnotation);
+Object defaultValue = null;
+
+try
+{
+defaultValue = annotationMethod.invoke(defaultAnnotation);
+}
+catch (NullPointerException e) //happens with primitive 
data-types without default values
+{
+defaultValue = null;
+}
+
 Object existingValue = 
annotationMethod.invoke(existingMetaData);
 
 if (existingValue == null /*possible with literal instances*/ 
||

deltaspike git commit: DELTASPIKE-1329 log update of project-stage value

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 0922aa512 -> 138a061c3


DELTASPIKE-1329 log update of project-stage value


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/138a061c
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/138a061c
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/138a061c

Branch: refs/heads/master
Commit: 138a061c378580203769c01e27d6052e9a1ab12b
Parents: 0922aa5
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Mar 17 19:11:48 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Mar 17 19:12:00 2018 +0100

--
 .../apache/deltaspike/core/util/ProjectStageProducer.java   | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/138a061c/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index b79be81..4d30f00 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -214,6 +214,15 @@ public class ProjectStageProducer implements Serializable
  */
 public static void setProjectStage(ProjectStage ps)
 {
+if (projectStage != null)
+{
+LOG.info("change project-stage from " + projectStage + " to " + 
ps);
+}
+else
+{
+LOG.info("change project-stage to " + ps);
+}
+
 projectStage = ps;
 }
 }

deltaspike git commit: DELTASPIKE-1319 basic support for test-suites and minor improvements

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 5a8369ae9 -> ca6b722bd


DELTASPIKE-1319 basic support for test-suites and minor improvements


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ca6b722b
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ca6b722b
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ca6b722b

Branch: refs/heads/master
Commit: ca6b722bd0cea0975580d74fefd53f25e9330cc5
Parents: 5a8369a
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Mar 1 21:50:11 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 1 21:50:11 2018 +0100

--
 .../testcontrol/api/junit/CdiTestRunner.java|  41 +--
 .../api/junit/CdiTestSuiteRunner.java   | 122 +++
 2 files changed, 124 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ca6b722b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index c855b40..f50650c 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -50,7 +50,6 @@ import javax.enterprise.context.SessionScoped;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Named;
 import javax.inject.Singleton;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -468,7 +467,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 // Note that Weld 1 was "flat" anyway, so this property 
only affects newer versions of Weld
 System.setProperty("org.jboss.weld.se.archive.isolation", 
"false");
 
-checkForLabeledAlternativeConfig(testClass);
+CdiTestSuiteRunner.applyAlternativeLabel(testClass);
 
 
container.boot(CdiTestSuiteRunner.getTestContainerConfig());
 setContainerStarted();
@@ -493,43 +492,6 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 startScopes(container, testClass, null, 
restrictedScopes.toArray(new Class[restrictedScopes.size()]));
 }
 
-private void checkForLabeledAlternativeConfig(Class testClass)
-{
-String activeAlternativeLabel = "";
-TestControl testControl = 
testClass.getAnnotation(TestControl.class);
-
-if (testControl != null)
-{
-Class activeTypedAlternativeLabel 
=
-testControl.activeAlternativeLabel();
-
-if 
(!TestControl.Label.class.equals(activeTypedAlternativeLabel))
-{
-Named labelName = 
activeTypedAlternativeLabel.getAnnotation(Named.class);
-
-if (labelName != null)
-{
-activeAlternativeLabel = labelName.value();
-}
-else
-{
-String labelClassName = 
activeTypedAlternativeLabel.getSimpleName();
-activeAlternativeLabel = labelClassName.substring(0, 
1).toLowerCase();
-
-if (labelClassName.length() > 1)
-{
-activeAlternativeLabel += 
labelClassName.substring(1);
-}
-}
-}
-}
-//always set it even if it is empty (it might overrule the value 
of the prev. test
-System.setProperty("activeAlternativeLabel", 
activeAlternativeLabel); //will be picked up by ds-core
-
-//TODO discuss a spi which allows to run such tests in parallel
-System.setProperty("activeAlternativeLabelSource", 
testClass.getName()); //can be used for custom logic
-}
-
 private void bootExternalContainers(Class testClass)
 {
 if (!this.testControl.startExternalContainers())
@@ -886,4 +848,5 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 
 return 
Collections.unmodifiableList(cdiTestRunner.testContext.externalContainers);
 }
+
 }

http://git-wip-us.apache.org/r

deltaspike git commit: DELTASPIKE-1320 labeled alternatives take priority over global alternatives

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 42d21481d -> 5a8369ae9


DELTASPIKE-1320 labeled alternatives take priority over global alternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5a8369ae
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5a8369ae
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5a8369ae

Branch: refs/heads/master
Commit: 5a8369ae9b1130951bc223352c8eb7ad64e3
Parents: 42d2148
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Mar 1 09:09:15 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Mar 1 09:12:36 2018 +0100

--
 ...AwareGlobalAlternativeBeanClassProvider.java | 24 
 1 file changed, 10 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5a8369ae/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
index 8a2ddf7..9d7d296 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
@@ -48,39 +48,35 @@ public class LabelAwareGlobalAlternativeBeanClassProvider 
implements Alternative
 }
 
 Map<String, String> allProperties = ConfigResolver.getAllProperties();
-// first read all globalAlternatives
 for (Map.Entry<String, String> property : allProperties.entrySet())
 {
-if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
+if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
 {
-String interfaceName = 
property.getKey().substring(GLOBAL_ALTERNATIVES.length());
+String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
 String implementation = property.getValue();
 if (LOG.isLoggable(Level.FINE))
 {
-LOG.fine("Enabling global alternative for interface " + 
interfaceName + ": " + implementation);
+LOG.fine("Enabling labeled alternative for interface " + 
interfaceName + ": " + implementation);
 }
 
 result.put(interfaceName, implementation);
 }
-}
-
-// and overwrite with any possible labled alternative, if exists
-for (Map.Entry<String, String> property : allProperties.entrySet())
-{
-if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
+else if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
 {
-String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
+String interfaceName = 
property.getKey().substring(GLOBAL_ALTERNATIVES.length());
 String implementation = property.getValue();
 if (LOG.isLoggable(Level.FINE))
 {
-LOG.fine("Enabling labeled alternative for interface " + 
interfaceName + ": " + implementation);
+LOG.fine("Enabling global alternative for interface " + 
interfaceName + ": " + implementation);
 }
 
-result.put(interfaceName, implementation);
+if (!result.containsKey(interfaceName)) //don't override 
labeled alternatives
+{
+result.put(interfaceName, implementation);
+}
 }
 }
 
 return result;
 }
-
 }

[1/2] deltaspike git commit: DELTASPIKE-1319 labeled alternatives

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 1c3a16be1 -> 7177eda1f


DELTASPIKE-1319 labeled alternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/036c8e95
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/036c8e95
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/036c8e95

Branch: refs/heads/master
Commit: 036c8e95e36e57f0fd5c7b4c6a1946ad27f1367a
Parents: 1c3a16b
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Feb 27 20:03:16 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Feb 27 20:03:16 2018 +0100

--
 .../exclude/extension/ExcludeExtension.java | 24 -
 .../deltaspike/testcontrol/api/TestControl.java |  9 
 .../testcontrol/api/junit/CdiTestRunner.java| 39 ++-
 .../api/literal/TestControlLiteral.java |  6 +++
 .../testcontrol/uc014/DefaultTestService.java   | 31 
 .../test/testcontrol/uc014/TestLabelX.java  | 25 ++
 .../test/testcontrol/uc014/TestService.java | 24 +
 .../testcontrol/uc014/TestServiceLabelX.java| 33 +
 .../testcontrol/uc014/TestServiceLabelY.java| 33 +
 .../uc014/TestServiceLabelYTest.java| 50 +++
 .../uc014/TestServiceNoLabelTest.java   | 44 +
 .../uc014/TestServiceTestLabelXTest.java| 46 +
 .../uc015/AlternativeServiceTest.java   | 44 +
 .../testcontrol/uc015/DefaultTestService.java   | 31 
 .../uc015/GlobalAlternativeTestService.java | 33 +
 .../testcontrol/uc015/LabeledServiceTest.java   | 52 
 .../testcontrol/uc015/LabeledTestService.java   | 33 +
 .../test/testcontrol/uc015/TestService.java | 24 +
 .../META-INF/apache-deltaspike.properties   |  6 +++
 19 files changed, 585 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/036c8e95/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index f521665..85b0221 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -66,6 +66,8 @@ import java.util.logging.Logger;
 public class ExcludeExtension implements Extension, Deactivatable
 {
 private static final String GLOBAL_ALTERNATIVES = "globalAlternatives.";
+private static final String LABELED_ALTERNATIVES = "labeledAlternatives";
+private static final String ACTIVE_ALTERNATIVE_LABEL_KEY = 
"activeAlternativeLabel";
 
 private static final Logger LOG = 
Logger.getLogger(ExcludeExtension.class.getName());
 
@@ -95,10 +97,30 @@ public class ExcludeExtension implements Extension, 
Deactivatable
 ClassDeactivationUtils.isActivated(GlobalAlternative.class);
 if (isGlobalAlternativeActivated)
 {
+String alternativeLabel = 
ConfigResolver.getPropertyValue(ACTIVE_ALTERNATIVE_LABEL_KEY);
+
+String activeQualifierLabel = null;
+if (alternativeLabel != null)
+{
+activeQualifierLabel = LABELED_ALTERNATIVES + "[" + 
alternativeLabel + "].";
+}
+
 Map<String, String> allProperties = 
ConfigResolver.getAllProperties();
 for (Map.Entry<String, String> property : allProperties.entrySet())
 {
-if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
+if (activeQualifierLabel != null && 
property.getKey().startsWith(activeQualifierLabel))
+{
+String interfaceName = 
property.getKey().substring(activeQualifierLabel.length());
+String implementation = property.getValue();
+if (LOG.isLoggable(Level.FINE))
+{
+LOG.fine("Enabling labeled alternative for interface "
++ interfaceName + ": " + implementation);
+}
+
+globalAlternatives.put(interfaceName, implementation);
+}
+else if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
 {
 Strin

[2/2] deltaspike git commit: DELTASPIKE-1320 spi for global-alternatives

[gpetracek]

DELTASPIKE-1320 spi for global-alternatives


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7177eda1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7177eda1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7177eda1

Branch: refs/heads/master
Commit: 7177eda1fa84d3e2db4119c74d470e5c344133bf
Parents: 036c8e9
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Feb 27 20:18:54 2018 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Feb 27 20:18:54 2018 +0100

--
 .../AlternativeBeanClassProvider.java   | 32 
 .../exclude/extension/ExcludeExtension.java | 65 +++-
 ...AwareGlobalAlternativeBeanClassProvider.java | 79 
 .../testcontrol/api/junit/CdiTestRunner.java|  3 +
 .../CustomAlternativeBeanClassProvider.java | 79 
 .../testcontrol/uc016/DefaultTestService.java   | 31 
 .../test/testcontrol/uc016/TestLabel.java   | 40 ++
 .../testcontrol/uc016/TestQualifierBinding.java | 32 
 .../test/testcontrol/uc016/TestService.java | 24 ++
 .../testcontrol/uc016/TestServiceLabelX.java| 34 +
 .../uc016/TestServiceLabelXTest.java| 46 
 .../testcontrol/uc016/TestServiceLabelY.java| 34 +
 .../uc016/TestServiceLabelYTest.java| 45 +++
 ...spi.alternative.AlternativeBeanClassProvider | 20 +
 14 files changed, 524 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7177eda1/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java
new file mode 100644
index 000..0387327
--- /dev/null
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.spi.alternative;
+
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+
+import java.util.Map;
+
+public interface AlternativeBeanClassProvider extends Deactivatable
+{
+/**
+ * @return mapping between the interface of the bean an the 
alternative-bean-class
+ */
+//instead of Class/Class we are using String/String to avoid classloader 
issues e.g. with EARs
+Map<String, String> getAlternativeMapping();
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7177eda1/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 85b0221..ade000d 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -18,10 +18,11 @@
  */
 package org.apache.deltaspike.core.impl.exclude.extension;
 
-import org.apache.deltaspike.core.api.config.ConfigResolver;
 import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
 import org.apache.deltaspike.core.api.exclude.Exclude;
 import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
+import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
+import org.apache.deltaspike.core.util.ServiceUtils;
 import org.apache.deltaspike.core.util.metadata

deltaspike git commit: DELTASPIKE-1294 improvements in view of proxies and extensibility

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 7b55ff21d -> 126362e4f


DELTASPIKE-1294 improvements in view of proxies and extensibility


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/126362e4
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/126362e4
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/126362e4

Branch: refs/heads/master
Commit: 126362e4f049976b6b14a8cd627add1029321148
Parents: 7b55ff2
Author: gpetracek <gpetra...@apache.org>
Authored: Wed Nov 29 16:19:28 2017 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Wed Nov 29 16:51:58 2017 +0100

--
 .../impl/authorization/SecuredAnnotationAuthorizer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/126362e4/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
--
diff --git 
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
 
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
index 9b16736..93a3798 100644
--- 
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
+++ 
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
@@ -19,6 +19,7 @@
 package org.apache.deltaspike.security.impl.authorization;
 
 import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.deltaspike.core.util.ProxyUtils;
 import org.apache.deltaspike.security.api.authorization.AccessDecisionState;
 import org.apache.deltaspike.security.api.authorization.AccessDecisionVoter;
 import 
org.apache.deltaspike.security.api.authorization.AccessDecisionVoterContext;
@@ -78,7 +79,7 @@ public class SecuredAnnotationAuthorizer
 return true;
 }
 
-private List extractMetadata(InvocationContext 
invocationContext)
+protected List extractMetadata(InvocationContext 
invocationContext)
 {
 List result = new ArrayList();
 
@@ -88,7 +89,7 @@ public class SecuredAnnotationAuthorizer
 // so we fall back on the declaringClass of the method.
 Class targetClass =
 invocationContext.getTarget() != null
-? invocationContext.getTarget().getClass()
+? 
ProxyUtils.getUnproxiedClass(invocationContext.getTarget().getClass())
 : method.getDeclaringClass();
 
 

deltaspike git commit: DELTASPIKE-1297 added license header

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master a95c0bc6f -> d1316e517


DELTASPIKE-1297 added license header


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/d1316e51
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/d1316e51
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/d1316e51

Branch: refs/heads/master
Commit: d1316e517f743526c280c0dbd592f04310dfab10
Parents: a95c0bc
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Oct 31 22:24:14 2017 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Oct 31 22:24:14 2017 +0100

--
 .../test/testcontrol/CustomMockManager.java   | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/d1316e51/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
index 3817870..bc8ba5f 100644
--- 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.deltaspike.test.testcontrol;
 
 import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager;

deltaspike git commit: DELTASPIKE-1298 initial hints about MockFilter and customizing the DynamicMockManager

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 38bc9c3d3 -> a95c0bc6f


DELTASPIKE-1298 initial hints about MockFilter and customizing the 
DynamicMockManager


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a95c0bc6
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a95c0bc6
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a95c0bc6

Branch: refs/heads/master
Commit: a95c0bc6f4b202648a7d9c87ca28a36ad3084e88
Parents: 38bc9c3
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Oct 31 19:44:21 2017 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Oct 31 19:44:21 2017 +0100

--
 .../src/main/asciidoc/test-control.adoc | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a95c0bc6/documentation/src/main/asciidoc/test-control.adoc
--
diff --git a/documentation/src/main/asciidoc/test-control.adoc 
b/documentation/src/main/asciidoc/test-control.adoc
index ce877c8..2ed48f0 100644
--- a/documentation/src/main/asciidoc/test-control.adoc
+++ b/documentation/src/main/asciidoc/test-control.adoc
@@ -586,6 +586,26 @@ jar {
 
 == SPI
 
+=== MockFilter
+
+Please make sure that you are aware of <<__MockFrameworks, Integration of Mock 
Frameworks>> before you continue with this section.
+
+If you would like to exclude some parts of your application- and/or test-code
+so that they aren’t eligible for the mocking mechanism,
+you can provide an own implementation of 
`org.apache.deltaspike.testcontrol.spi.mock.MockFilter` and
+register it in 
`/META-INF/services/org.apache.deltaspike.testcontrol.spi.mock.MockFilter`.
+
+That's quite special and you need to know the CDI-SPI a bit.
+To get an idea about the required steps, you can have a look at the default 
implementation used by DeltaSpike-Test itself.
+
+Such a filter is also needed in case you would like to customize 
DeltaSpike-Test.
+For example to provide an `@Alternative` implementation for DynamicMockManager,
+you need to implement 
`org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager`, annotate it 
with `@Alternative`,
+ensure that you keep the type-information with `@Typed`,
+configure the alternative bean in `/META-INF/beans.xml` (in the 
test-classpath) and
+provide a custom `MockFilter` (as described above) which excludes the custom 
mock-manager.
+(Otherwise DeltaSpike-Test will try to mock the custom mock-manager.)
+
 === ExternalContainer
 
 org.apache.deltaspike.testcontrol.spi.ExternalContainer allows to

deltaspike git commit: DELTASPIKE-1297 added test with a customized DynamicMockManager

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master edeff80a2 -> 38bc9c3d3


DELTASPIKE-1297 added test with a customized DynamicMockManager


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/38bc9c3d
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/38bc9c3d
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/38bc9c3d

Branch: refs/heads/master
Commit: 38bc9c3d340b17410b4fc2a1ce45d77981b366e5
Parents: edeff80
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Oct 31 19:27:20 2017 +0100
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Oct 31 19:27:20 2017 +0100

--
 .../test/testcontrol/CustomMockManager.java | 36 
 .../testcontrol/InternalTestMockFilter.java |  4 +-
 .../mock/uc016/CustomMockManagerTest.java   | 87 
 .../impl/src/test/resources/META-INF/beans.xml  |  4 +
 4 files changed, 130 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/38bc9c3d/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
new file mode 100644
index 000..3817870
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java
@@ -0,0 +1,36 @@
+package org.apache.deltaspike.test.testcontrol;
+
+import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager;
+import org.apache.deltaspike.testcontrol.impl.mock.SimpleMockManager;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Typed;
+import java.lang.annotation.Annotation;
+
+@Alternative
+
+@RequestScoped
+@Typed(DynamicMockManager.class)
+public class CustomMockManager extends SimpleMockManager
+{
+private static boolean isCalled;
+
+@Override
+public  T getMock(Class beanClass, Annotation... qualifiers)
+{
+isCalled = true;
+
+return super.getMock(beanClass, qualifiers);
+}
+
+public static boolean isIsCalled()
+{
+return isCalled;
+}
+
+public static void resetInternals()
+{
+isCalled = false;
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/38bc9c3d/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/InternalTestMockFilter.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/InternalTestMockFilter.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/InternalTestMockFilter.java
index 242fbcf..f333bfd 100644
--- 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/InternalTestMockFilter.java
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/InternalTestMockFilter.java
@@ -26,6 +26,8 @@ public class InternalTestMockFilter extends DefaultMockFilter
 
 protected boolean isInternalPackage(String packageName)
 {
-return super.isInternalPackage(packageName) && 
!packageName.startsWith(DS_TEST_BASE_PACKAGE);
+return super.isInternalPackage(packageName) &&
+(!packageName.startsWith(DS_TEST_BASE_PACKAGE) ||
+
packageName.equals(CustomMockManager.class.getPackage().getName()));
 }
 }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/38bc9c3d/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc016/CustomMockManagerTest.java
--
diff --git 
a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc016/CustomMockManagerTest.java
 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc016/CustomMockManagerTest.java
new file mode 100644
index 000..1f94f37
--- /dev/null
+++ 
b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc016/CustomMockManagerTest.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF lice

deltaspike git commit: DELTASPIKE-1259 upgraded version numbers

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master e6b119c70 -> b1276fcd3


DELTASPIKE-1259 upgraded version numbers


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b1276fcd
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b1276fcd
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b1276fcd

Branch: refs/heads/master
Commit: b1276fcd3c5ff296674b8dd5f5432c549c996d04
Parents: e6b119c
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Jun 3 13:19:49 2017 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Jun 3 13:19:49 2017 +0200

--
 deltaspike/modules/data/test-ee7/pom.xml   | 2 +-
 deltaspike/modules/data/test-java8/pom.xml | 2 +-
 pom.xml| 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b1276fcd/deltaspike/modules/data/test-ee7/pom.xml
--
diff --git a/deltaspike/modules/data/test-ee7/pom.xml 
b/deltaspike/modules/data/test-ee7/pom.xml
index 8e2942a..5cc6b56 100644
--- a/deltaspike/modules/data/test-ee7/pom.xml
+++ b/deltaspike/modules/data/test-ee7/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.deltaspike.modules
 data-module-project
-1.8.0-SNAPSHOT
+1.8.1-SNAPSHOT
 
 
 deltaspike-data-module-test-ee7

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b1276fcd/deltaspike/modules/data/test-java8/pom.xml
--
diff --git a/deltaspike/modules/data/test-java8/pom.xml 
b/deltaspike/modules/data/test-java8/pom.xml
index a4065b5..112f0cf 100644
--- a/deltaspike/modules/data/test-java8/pom.xml
+++ b/deltaspike/modules/data/test-java8/pom.xml
@@ -22,7 +22,7 @@
 
 data-module-project
 org.apache.deltaspike.modules
-1.8.0-SNAPSHOT
+1.8.1-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b1276fcd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ade4c7b..5568d3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,8 +48,8 @@
 
 
 1.5.2
-
1.7.2
-
1.8.0-SNAPSHOT
+
1.8.0
+
1.8.1-SNAPSHOT
 
${project.build.directory}/co-site
 
 

deltaspike git commit: DELTASPIKE-1258 skip #flush before #commit with one active EntityManager

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 9a371a22c -> e6b119c70


DELTASPIKE-1258 skip #flush before #commit with one active EntityManager


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/e6b119c7
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/e6b119c7
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/e6b119c7

Branch: refs/heads/master
Commit: e6b119c708bd684c7800faa5c86c1aafb110d723
Parents: 9a371a2
Author: gpetracek <gpetra...@apache.org>
Authored: Thu Jun 1 15:09:27 2017 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Thu Jun 1 15:48:16 2017 +0200

--
 .../jpa/impl/transaction/ResourceLocalTransactionStrategy.java | 2 +-
 .../deltaspike/test/jpa/api/shared/TestEntityManager.java  | 6 +-
 .../deltaspike/test/jpa/api/shared/TestEntityTransaction.java  | 5 -
 .../defaultinjection/FailedFlushTransactionalBean.java | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e6b119c7/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
--
diff --git 
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
 
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
index 9e810a8..6f11a8b 100644
--- 
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
+++ 
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
@@ -193,7 +193,7 @@ public class ResourceLocalTransactionStrategy implements 
TransactionStrategy
 
 boolean rollbackOnly = 
isRollbackOnly(transactionalAnnotation);
 
-if (!rollbackOnly)
+if (!rollbackOnly && entityManagerEntryList.size() > 1)
 {
 // but first try to flush all the transactions and 
write the updates to the database
 for (EntityManagerEntry currentEntityManagerEntry 
: entityManagerEntryList)

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e6b119c7/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
--
diff --git 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
index 44654f5..343624b 100644
--- 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
+++ 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
@@ -34,7 +34,7 @@ import java.util.Map;
 @Typed()
 public class TestEntityManager implements EntityManager
 {
-private EntityTransaction entityTransaction = new TestEntityTransaction();
+private EntityTransaction entityTransaction = new 
TestEntityTransaction(this);
 
 private boolean open = true;
 private boolean flushed = false;
@@ -302,4 +302,8 @@ public class TestEntityManager implements EntityManager
 {
 return flushed;
 }
+
+public void setFlushed(boolean flushed) {
+this.flushed = flushed;
+}
 }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e6b119c7/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
--
diff --git 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
index 870d692..27d92b7 100644
--- 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
+++ 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
@@ -26,9 +26,11 @@ public class TestEntityTransaction implements 
EntityTransaction
 private boolean committed = false;
 private boolean rolledBack = false;
 private boolean markRolledBack = false;
+private TestEntityManager testEntityManager;
 
-public TestEntityTransaction()
+public TestEntityTransaction(TestEntit

deltaspike git commit: DELTASPIKE-1151 dropped optional cleanup

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master b67298237 -> b02acc77e


DELTASPIKE-1151 dropped optional cleanup


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b02acc77
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b02acc77
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b02acc77

Branch: refs/heads/master
Commit: b02acc77ef1cd53abc40238f02950a4c404517e3
Parents: b672982
Author: gpetracek <gpetra...@apache.org>
Authored: Fri May 20 19:38:39 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri May 20 19:38:50 2016 +0200

--
 .../deltaspike/testcontrol/api/junit/CdiTestRunner.java | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b02acc77/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index 8cd2593..1f97094 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -265,7 +265,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 Statement result = super.withAfterClasses(statement);
 if (!CdiTestSuiteRunner.isContainerStarted())
 {
-return new AfterClassStatement(result, this.testContext, 
notifierIdentities);
+return new AfterClassStatement(result, this.testContext);
 }
 return result;
 }
@@ -377,22 +377,17 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 {
 private final Statement wrapped;
 private final ContainerAwareTestContext testContext;
-private Set notifierIdentities;
 
 public AfterClassStatement(Statement statement,
-   ContainerAwareTestContext testContext,
-   Set notifierIdentities)
+   ContainerAwareTestContext testContext)
 {
 this.wrapped = statement;
 this.testContext = testContext;
-this.notifierIdentities = notifierIdentities;
 }
 
 @Override
 public void evaluate() throws Throwable
 {
-notifierIdentities.clear();
-
 try
 {
 wrapped.evaluate();

[2/2] deltaspike git commit: DELTASPIKE-1146 improved test-code of TransactionalBean#executeInTransaction

[gpetracek]

DELTASPIKE-1146 improved test-code of TransactionalBean#executeInTransaction


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f3ee6faf
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f3ee6faf
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f3ee6faf

Branch: refs/heads/master
Commit: f3ee6faff9bccaaef597d7e7cd37b44bd9287967
Parents: 21848ec
Author: gpetracek <gpetra...@apache.org>
Authored: Mon May 16 17:25:36 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon May 16 17:26:24 2016 +0200

--
 .../api/transactionscoped/defaultinjection/TransactionalBean.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f3ee6faf/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/TransactionalBean.java
--
diff --git 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/TransactionalBean.java
 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/TransactionalBean.java
index aad1bcd..caee2ea 100644
--- 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/TransactionalBean.java
+++ 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/TransactionalBean.java
@@ -33,5 +33,7 @@ public class TransactionalBean
 @Transactional
 public void executeInTransaction()
 {
+//just access the transaction-scoped bean
+entityManager.getTransaction();
 }
 }

[1/2] deltaspike git commit: DELTASPIKE-1145 improved test for @TransactionScoped

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master a14aef88a -> f3ee6faff


DELTASPIKE-1145 improved test for @TransactionScoped


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/21848ec5
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/21848ec5
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/21848ec5

Branch: refs/heads/master
Commit: 21848ec52c478a18fb10730e821a469aee31ce7b
Parents: a14aef8
Author: gpetracek <gpetra...@apache.org>
Authored: Mon May 16 17:24:54 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Mon May 16 17:26:00 2016 +0200

--
 .../DefaultTransactionScopedEntityManagerInjectionTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/21848ec5/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/DefaultTransactionScopedEntityManagerInjectionTest.java
--
diff --git 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/DefaultTransactionScopedEntityManagerInjectionTest.java
 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/DefaultTransactionScopedEntityManagerInjectionTest.java
index 4a0c62b..ad3ffed 100644
--- 
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/DefaultTransactionScopedEntityManagerInjectionTest.java
+++ 
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactionscoped/defaultinjection/DefaultTransactionScopedEntityManagerInjectionTest.java
@@ -114,6 +114,8 @@ public class 
DefaultTransactionScopedEntityManagerInjectionTest
 @Test
 public void invalidEntityManagerUsageAfterTransaction()
 {
+transactionalBean.executeInTransaction();
+
 try
 {
 //not available because there is no transactional method

deltaspike git commit: DELTASPIKE-1140 explicit exclude of the target-folder in the test-ee7-folder

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master cf140a98c -> b610ffb14


DELTASPIKE-1140 explicit exclude of the target-folder in the test-ee7-folder


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b610ffb1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b610ffb1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b610ffb1

Branch: refs/heads/master
Commit: b610ffb141f820b9967448d9229054837ebe2b73
Parents: cf140a9
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 29 17:13:16 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 29 17:13:16 2016 +0200

--
 deltaspike/pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b610ffb1/deltaspike/pom.xml
--
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 9a242c2..fd294b1 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -90,6 +90,7 @@
 readme/**/*
 **/*.log
 target/**
+test-ee7/target/**
 **/*.iml
 
 

deltaspike git commit: DELTASPIKE-1135 support for type-safe messages during the startup

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master b28309f01 -> 53e54564c


DELTASPIKE-1135 support for type-safe messages during the startup


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/53e54564
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/53e54564
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/53e54564

Branch: refs/heads/master
Commit: 53e54564c6de31376a88e22520e63a1d83b8adc5
Parents: b28309f
Author: gpetracek <gpetra...@apache.org>
Authored: Wed Apr 27 08:12:03 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 29 09:10:57 2016 +0200

--
 .../apache/deltaspike/jsf/impl/message/JsfAwareLocaleResolver.java | 2 +-
 .../org/apache/deltaspike/jsf/impl/message/JsfMessageResolver.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/53e54564/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfAwareLocaleResolver.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfAwareLocaleResolver.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfAwareLocaleResolver.java
index 6f9b7ca..ec5033a 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfAwareLocaleResolver.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfAwareLocaleResolver.java
@@ -37,7 +37,7 @@ public class JsfAwareLocaleResolver extends 
DefaultLocaleResolver
 public Locale getLocale()
 {
 FacesContext facesContext = FacesContext.getCurrentInstance();
-if (facesContext != null)
+if (facesContext != null && facesContext.getCurrentPhaseId() != null)
 {
 UIViewRoot viewRoot = facesContext.getViewRoot();
 Locale result = null;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/53e54564/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageResolver.java
--
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageResolver.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageResolver.java
index 9f1a20b..13f6959 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageResolver.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageResolver.java
@@ -37,7 +37,7 @@ public class JsfMessageResolver extends DefaultMessageResolver
 
 FacesContext facesContext = FacesContext.getCurrentInstance();
 
-if (facesContext == null)
+if (facesContext == null || facesContext.getCurrentPhaseId() == null)
 {
 return result;
 }

svn commit: r13437 - /release/deltaspike/1.6.0/

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 14:53:43 2016
New Revision: 13437

Log:
cleanup

Removed:
release/deltaspike/1.6.0/

svn commit: r986832 - /websites/production/deltaspike/content/

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 14:52:14 2016
New Revision: 986832

Log:
Publishing svnmucc operation to deltaspike site by gpetracek

Added:
websites/production/deltaspike/content/
  - copied from r986831, websites/staging/deltaspike/trunk/content/

svn commit: r1741274 - /deltaspike/site/trunk/content/index.html

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 14:50:11 2016
New Revision: 1741274

URL: http://svn.apache.org/viewvc?rev=1741274=rev
Log:
updated content

Modified:
deltaspike/site/trunk/content/index.html

Modified: deltaspike/site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/index.html?rev=1741274=1741273=1741274=diff
==
--- deltaspike/site/trunk/content/index.html (original)
+++ deltaspike/site/trunk/content/index.html Wed Apr 27 14:50:11 2016
@@ -24,8 +24,8 @@
 
 
 News
-Apache DeltaSpike 1.6.0 is now out!
-View details »
+Apache DeltaSpike 1.6.1 is now out!
+View details »
 
 
 

svn commit: r986830 - /websites/production/deltaspike/content/

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 14:50:39 2016
New Revision: 986830

Log:
Publishing svnmucc operation to deltaspike site by gpetracek

Added:
websites/production/deltaspike/content/
  - copied from r986829, websites/staging/deltaspike/trunk/content/

svn commit: r1741263 - in /deltaspike/site/trunk/content/javadoc/1.6.2-SNAPSHOT: ./ org/ org/apache/ org/apache/deltaspike/ org/apache/deltaspike/cdise/ org/apache/deltaspike/cdise/api/ org/apache/del

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 13:43:57 2016
New Revision: 1741263

URL: http://svn.apache.org/viewvc?rev=1741263=rev
Log:
Site checkin for project Apache DeltaSpike Sources


[This commit notification would consist of 127 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1741261 - /deltaspike/site/trunk/content/javadoc/1.6.2-SNAPSHOT/

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 13:34:25 2016
New Revision: 1741261

URL: http://svn.apache.org/viewvc?rev=1741261=rev
Log:
Automatic svn path creation: 
https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/javadoc/1.6.2-SNAPSHOT

Added:
deltaspike/site/trunk/content/javadoc/1.6.2-SNAPSHOT/

svn commit: r1741260 - in /deltaspike/site/trunk/content: download.html examples.html javadoc.html news.html

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 13:31:55 2016
New Revision: 1741260

URL: http://svn.apache.org/viewvc?rev=1741260=rev
Log:
Site checkin for project Apache DeltaSpike Site

Modified:
deltaspike/site/trunk/content/download.html
deltaspike/site/trunk/content/examples.html
deltaspike/site/trunk/content/javadoc.html
deltaspike/site/trunk/content/news.html

Modified: deltaspike/site/trunk/content/download.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/download.html?rev=1741260=1741259=1741260=diff
==
--- deltaspike/site/trunk/content/download.html (original)
+++ deltaspike/site/trunk/content/download.html Wed Apr 27 13:31:55 2016
@@ -256,7 +256,7 @@ table.CodeRay td.code>pre{padding:0}
 Latest Release
 
 
-v1.6.0
+v1.6.1
 
 
 
@@ -266,28 +266,28 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.zip;>distribution-full-1.6.0.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.1/distribution-full-1.6.1.zip;>distribution-full-1.6.1.zip
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.asc;>distribution-full-1.6.0.zip.asc
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.zip.asc;>distribution-full-1.6.1.zip.asc
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.md5;>distribution-full-1.6.0.zip.md5
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.zip.md5;>distribution-full-1.6.1.zip.md5
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.sha1;>distribution-full-1.6.0.zip.sha1
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.zip.sha1;>distribution-full-1.6.1.zip.sha1
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz;>distribution-full-1.6.0.tar.gz
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz;>distribution-full-1.6.1.tar.gz
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.asc;>distribution-full-1.6.0.tar.gz.asc
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.asc;>distribution-full-1.6.1.tar.gz.asc
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.md5;>distribution-full-1.6.0.tar.gz.md5
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.md5;>distribution-full-1.6.1.tar.gz.md5
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.sha1;>distribution-full-1.6.0.tar.gz.sha1
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.sha1;>distribution-full-1.6.1.tar.gz.sha1
 
 
 
@@ -299,16 +299,16 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip;>deltaspike-1.6.0-source-release.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip;>deltaspike-1.6.1-source-release.zip
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.asc;>deltaspike-1.6.0-source-release.zip.asc
+http://www.apache.org/dist/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.asc;>deltaspike-1.6.1-source-release.zip.asc
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.md5;>deltaspike-1.6.0-source-release.zip.md5
+http://www.apache.org/dist/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.md5;>deltaspike-1.6.1-source-release.zip.md5
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.sha1;>deltaspike-1.6.0-source-release.zip.sha1
+http://www.apache.org/dist/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.sha1;>deltaspike-1.6.1-source-release.zip.sha1
 
 
 
@@ -351,7 +351,7 @@ the signatures using e.g.:
 
 
 $ pgpk -a KEYS
-$ pgpv deltaspike-project-1.6.0-source-release.zip.asc
+$ pgpv deltaspike-project-1.6.1-source-release.zip.asc
 
 
 
@@ -360,7 +360,7 @@ $ pgpv deltaspike-project-1.6.0-source-r
 
 
 $ pgp -ka KEYS
-$ pgp deltaspike-project-1.6.0-source-release.zip.asc
+$ pgp deltaspike-project-1.6.1-source-release.zip.asc
 
 
 
@@ -369,7 +369,7 @@ $ pgp deltaspike-project-1.6.0-source-re
 
 
 $ gpg --import KEYS
-$ gpg --verify deltaspike-project-1.6.0-source-release.zip.asc
+$ gpg --verify deltaspike-project-1.6.1-source-release.zip.asc
 
 
 

Modified: deltaspike/site/trunk/content/examples.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/examples.html?rev=1741260=1741259=1741260=diff
==
--- deltaspike/site/trunk/content/examples.html (original)
+++ deltaspike/site/trunk/content/examples.html Wed Apr 27 13:31:55 2016
@@ -255,7 +255,7 @@ table.CodeRay td.code>pre{padding:0}
   

svn commit: r1741259 - in /deltaspike/site/trunk/content/documentation: build.html configure.html scheduler.html snapshots.html

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 13:28:40 2016
New Revision: 1741259

URL: http://svn.apache.org/viewvc?rev=1741259=rev
Log:
Site checkin for project Apache DeltaSpike Documentation

Modified:
deltaspike/site/trunk/content/documentation/build.html
deltaspike/site/trunk/content/documentation/configure.html
deltaspike/site/trunk/content/documentation/scheduler.html
deltaspike/site/trunk/content/documentation/snapshots.html

Modified: deltaspike/site/trunk/content/documentation/build.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/build.html?rev=1741259=1741258=1741259=diff
==
--- deltaspike/site/trunk/content/documentation/build.html (original)
+++ deltaspike/site/trunk/content/documentation/build.html Wed Apr 27 13:28:40 
2016
@@ -277,7 +277,7 @@ table.CodeRay td.code>pre{padding:0}
 The DeltaSpike source (modules and examples) is provided for inspection, 
contribution and testing purposes. The source must be built with Maven, which 
has been used to automate the compilation, testing and packaging processes. 
Arquillian tests are included with the source and a CDI implementation or 
container can be specified with which to carry out the tests.
 
 
-In all cases, to obtain the DeltaSpike source, https://deltaspike.apache.org/download.html;>download 
deltaspike-project-1.6.0-source-release.zip and extract the 
contents.
+In all cases, to obtain the DeltaSpike source, https://deltaspike.apache.org/download.html;>download 
deltaspike-project-1.6.1-source-release.zip and extract the 
contents.
 
 
 
@@ -301,7 +301,7 @@ You can also obtain the DeltaSpike sourc
 
 
 
-$ cd 
/path/to/deltaspike-project-1.6.0/
+$ cd 
/path/to/deltaspike-project-1.6.1/
 $ mvn clean install
 
 

Modified: deltaspike/site/trunk/content/documentation/configure.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/configure.html?rev=1741259=1741258=1741259=diff
==
--- deltaspike/site/trunk/content/documentation/configure.html (original)
+++ deltaspike/site/trunk/content/documentation/configure.html Wed Apr 27 
13:28:40 2016
@@ -309,7 +309,7 @@ You can also opt to use the lastest Delt
 
 
 properties
-deltaspike.version1.6.0/deltaspike.version
+deltaspike.version1.6.1/deltaspike.version
 /properties
 
 
@@ -418,7 +418,7 @@ repositories {
 }
 dependencyManagement {
 imports {
-mavenBom 'org.apache.deltaspike.distribution:distributions-bom:1.6.0'
+mavenBom 'org.apache.deltaspike.distribution:distributions-bom:1.6.1'
 }
 }
 dependencies {

Modified: deltaspike/site/trunk/content/documentation/scheduler.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/scheduler.html?rev=1741259=1741258=1741259=diff
==
--- deltaspike/site/trunk/content/documentation/scheduler.html (original)
+++ deltaspike/site/trunk/content/documentation/scheduler.html Wed Apr 27 
13:28:40 2016
@@ -609,7 +609,7 @@ Such an adapter just needs to implement
 
 
 It is possible to replace the default integration with Quartz. Any 
scheduler that supports cron-expressions for job-classes can be used.
-For more information, see https://deltaspike.apache.org/javadoc/1.6.0/org/apache/deltaspike/scheduler/spi/Scheduler.html;>Scheduler
 javadoc.
+For more information, see https://deltaspike.apache.org/javadoc/1.6.1/org/apache/deltaspike/scheduler/spi/Scheduler.html;>Scheduler
 javadoc.
 
 
 

Modified: deltaspike/site/trunk/content/documentation/snapshots.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/snapshots.html?rev=1741259=1741258=1741259=diff
==
--- deltaspike/site/trunk/content/documentation/snapshots.html (original)
+++ deltaspike/site/trunk/content/documentation/snapshots.html Wed Apr 27 
13:28:40 2016
@@ -343,7 +343,7 @@ Snapshots provide previews of DeltaSpike
 
 
 properties
-deltaspike.version1.6.1-SNAPSHOT/deltaspike.version
+deltaspike.version1.6.2-SNAPSHOT/deltaspike.version
 /properties
 
 

svn commit: r1741258 - in /deltaspike/site/trunk/content/staging: download.html examples.html javadoc.html news.html

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 13:27:37 2016
New Revision: 1741258

URL: http://svn.apache.org/viewvc?rev=1741258=rev
Log:
Site checkin for project Apache DeltaSpike Site

Modified:
deltaspike/site/trunk/content/staging/download.html
deltaspike/site/trunk/content/staging/examples.html
deltaspike/site/trunk/content/staging/javadoc.html
deltaspike/site/trunk/content/staging/news.html

Modified: deltaspike/site/trunk/content/staging/download.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/download.html?rev=1741258=1741257=1741258=diff
==
--- deltaspike/site/trunk/content/staging/download.html (original)
+++ deltaspike/site/trunk/content/staging/download.html Wed Apr 27 13:27:37 2016
@@ -256,7 +256,7 @@ table.CodeRay td.code>pre{padding:0}
 Latest Release
 
 
-v1.6.0
+v1.6.1
 
 
 
@@ -266,28 +266,28 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.zip;>distribution-full-1.6.0.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.1/distribution-full-1.6.1.zip;>distribution-full-1.6.1.zip
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.asc;>distribution-full-1.6.0.zip.asc
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.zip.asc;>distribution-full-1.6.1.zip.asc
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.md5;>distribution-full-1.6.0.zip.md5
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.zip.md5;>distribution-full-1.6.1.zip.md5
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.sha1;>distribution-full-1.6.0.zip.sha1
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.zip.sha1;>distribution-full-1.6.1.zip.sha1
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz;>distribution-full-1.6.0.tar.gz
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz;>distribution-full-1.6.1.tar.gz
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.asc;>distribution-full-1.6.0.tar.gz.asc
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.asc;>distribution-full-1.6.1.tar.gz.asc
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.md5;>distribution-full-1.6.0.tar.gz.md5
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.md5;>distribution-full-1.6.1.tar.gz.md5
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.sha1;>distribution-full-1.6.0.tar.gz.sha1
+http://www.apache.org/dist/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.sha1;>distribution-full-1.6.1.tar.gz.sha1
 
 
 
@@ -299,16 +299,16 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip;>deltaspike-1.6.0-source-release.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip;>deltaspike-1.6.1-source-release.zip
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.asc;>deltaspike-1.6.0-source-release.zip.asc
+http://www.apache.org/dist/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.asc;>deltaspike-1.6.1-source-release.zip.asc
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.md5;>deltaspike-1.6.0-source-release.zip.md5
+http://www.apache.org/dist/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.md5;>deltaspike-1.6.1-source-release.zip.md5
 
 
-http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.sha1;>deltaspike-1.6.0-source-release.zip.sha1
+http://www.apache.org/dist/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.sha1;>deltaspike-1.6.1-source-release.zip.sha1
 
 
 
@@ -351,7 +351,7 @@ the signatures using e.g.:
 
 
 $ pgpk -a KEYS
-$ pgpv deltaspike-project-1.6.0-source-release.zip.asc
+$ pgpv deltaspike-project-1.6.1-source-release.zip.asc
 
 
 
@@ -360,7 +360,7 @@ $ pgpv deltaspike-project-1.6.0-source-r
 
 
 $ pgp -ka KEYS
-$ pgp deltaspike-project-1.6.0-source-release.zip.asc
+$ pgp deltaspike-project-1.6.1-source-release.zip.asc
 
 
 
@@ -369,7 +369,7 @@ $ pgp deltaspike-project-1.6.0-source-re
 
 
 $ gpg --import KEYS
-$ gpg --verify deltaspike-project-1.6.0-source-release.zip.asc
+$ gpg --verify deltaspike-project-1.6.1-source-release.zip.asc
 
 
 

Modified: deltaspike/site/trunk/content/staging/examples.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/examples.html?rev=1741258=1741257=1741258=diff
==
--- deltaspike/site/trunk/content/staging/examples.html (original)
+++ deltaspike/site/trunk/content/staging/exa

svn commit: r1741257 - in /deltaspike/site/trunk/content/staging/documentation: build.html configure.html scheduler.html snapshots.html

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 13:27:16 2016
New Revision: 1741257

URL: http://svn.apache.org/viewvc?rev=1741257=rev
Log:
Site checkin for project Apache DeltaSpike Documentation

Modified:
deltaspike/site/trunk/content/staging/documentation/build.html
deltaspike/site/trunk/content/staging/documentation/configure.html
deltaspike/site/trunk/content/staging/documentation/scheduler.html
deltaspike/site/trunk/content/staging/documentation/snapshots.html

Modified: deltaspike/site/trunk/content/staging/documentation/build.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/build.html?rev=1741257=1741256=1741257=diff
==
--- deltaspike/site/trunk/content/staging/documentation/build.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/build.html Wed Apr 27 
13:27:16 2016
@@ -277,7 +277,7 @@ table.CodeRay td.code>pre{padding:0}
 The DeltaSpike source (modules and examples) is provided for inspection, 
contribution and testing purposes. The source must be built with Maven, which 
has been used to automate the compilation, testing and packaging processes. 
Arquillian tests are included with the source and a CDI implementation or 
container can be specified with which to carry out the tests.
 
 
-In all cases, to obtain the DeltaSpike source, https://deltaspike.apache.org/download.html;>download 
deltaspike-project-1.6.0-source-release.zip and extract the 
contents.
+In all cases, to obtain the DeltaSpike source, https://deltaspike.apache.org/download.html;>download 
deltaspike-project-1.6.1-source-release.zip and extract the 
contents.
 
 
 
@@ -301,7 +301,7 @@ You can also obtain the DeltaSpike sourc
 
 
 
-$ cd 
/path/to/deltaspike-project-1.6.0/
+$ cd 
/path/to/deltaspike-project-1.6.1/
 $ mvn clean install
 
 

Modified: deltaspike/site/trunk/content/staging/documentation/configure.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/configure.html?rev=1741257=1741256=1741257=diff
==
--- deltaspike/site/trunk/content/staging/documentation/configure.html 
(original)
+++ deltaspike/site/trunk/content/staging/documentation/configure.html Wed Apr 
27 13:27:16 2016
@@ -309,7 +309,7 @@ You can also opt to use the lastest Delt
 
 
 properties
-deltaspike.version1.6.0/deltaspike.version
+deltaspike.version1.6.1/deltaspike.version
 /properties
 
 
@@ -418,7 +418,7 @@ repositories {
 }
 dependencyManagement {
 imports {
-mavenBom 'org.apache.deltaspike.distribution:distributions-bom:1.6.0'
+mavenBom 'org.apache.deltaspike.distribution:distributions-bom:1.6.1'
 }
 }
 dependencies {
@@ -427,10 +427,12 @@ dependencies {
 }
 sourceSets {
main {
- //For CDI to work, need to put the resources and classes in the same 
directory
- output.resourcesDir = 'build/classes/main'
- output.classesDir   = 'build/classes/main'
+ //To use standard bean discovery mechanisms, CDI expects beans.xml to be 
in your classes directory
+ output.resourcesDir = output.classesDir
}
+   test {
+output.resourcesDir = output.classesDir
+   } // and any other sourceSet you might have.
  }
 
 

Modified: deltaspike/site/trunk/content/staging/documentation/scheduler.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/scheduler.html?rev=1741257=1741256=1741257=diff
==
--- deltaspike/site/trunk/content/staging/documentation/scheduler.html 
(original)
+++ deltaspike/site/trunk/content/staging/documentation/scheduler.html Wed Apr 
27 13:27:16 2016
@@ -609,7 +609,7 @@ Such an adapter just needs to implement
 
 
 It is possible to replace the default integration with Quartz. Any 
scheduler that supports cron-expressions for job-classes can be used.
-For more information, see https://deltaspike.apache.org/javadoc/1.6.0/org/apache/deltaspike/scheduler/spi/Scheduler.html;>Scheduler
 javadoc.
+For more information, see https://deltaspike.apache.org/javadoc/1.6.1/org/apache/deltaspike/scheduler/spi/Scheduler.html;>Scheduler
 javadoc.
 
 
 

Modified: deltaspike/site/trunk/content/staging/documentation/snapshots.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/snapshots.html?rev=1741257=1741256=1741257=diff
==
--- deltaspike/site/trunk/content/staging/documentation/snapshots.html 
(original)
+++ deltaspike/site/trunk/content/staging/documentation/snapshots.html Wed Apr 
27 13:27:16 2016
@@ -343,7 +343,7 @@ Snapshots provide previews of DeltaSpike
 
 
 properties
-deltaspike.version1.6.1-SNAPSHOT/deltaspike.version
+deltaspike.version1.6.2-SNAPSHOT/deltaspike.version
 /properties
 
 

deltaspike git commit: DELTASPIKE-1136 information about v1.6.1

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 2e31a27a4 -> b28309f01


DELTASPIKE-1136 information about v1.6.1


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b28309f0
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b28309f0
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b28309f0

Branch: refs/heads/master
Commit: b28309f01de0e3a5609e147477814ab3839fe316
Parents: 2e31a27
Author: gpetracek <gpetra...@apache.org>
Authored: Wed Apr 27 14:32:39 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Wed Apr 27 14:32:39 2016 +0200

--
 pom.xml  | 4 ++--
 site/src/main/asciidoc/news.adoc | 5 +
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b28309f0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 52a3aa5..b1cb5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,8 +48,8 @@
 
 
 1.5.2
-
1.6.0
-
1.6.1-SNAPSHOT
+
1.6.1
+
1.6.2-SNAPSHOT
 
${project.build.directory}/co-site
 
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b28309f0/site/src/main/asciidoc/news.adoc
--
diff --git a/site/src/main/asciidoc/news.adoc b/site/src/main/asciidoc/news.adoc
index a0ca278..e13773b 100644
--- a/site/src/main/asciidoc/news.adoc
+++ b/site/src/main/asciidoc/news.adoc
@@ -12,6 +12,11 @@ minor release to support Java 6.  Patch fixes on 1.6.x will 
continue
 to support it, but our next minor release (1.7.0) will require
 Java 7 at a minimum.
 
+== 25th Release (1.6.1) (23.04.2016)
+
+The Apache DeltaSpike team is pleased to announce the 25th release
+(v1.6.1).
+
 == 24th Release (1.6.0) (02.04.2016)
 
 The Apache DeltaSpike team is pleased to announce the 24th release

svn commit: r13433 - /release/deltaspike/1.6.1/

[gpetracek]

Author: gpetracek
Date: Wed Apr 27 05:30:53 2016
New Revision: 13433

Log:
deltaspike v1.6.1

Added:
release/deltaspike/1.6.1/
release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip   (with props)
release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.asc
release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.md5
release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.sha1
release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz   (with props)
release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.asc
release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.md5
release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.sha1
release/deltaspike/1.6.1/distribution-full-1.6.1.zip   (with props)
release/deltaspike/1.6.1/distribution-full-1.6.1.zip.asc
release/deltaspike/1.6.1/distribution-full-1.6.1.zip.md5
release/deltaspike/1.6.1/distribution-full-1.6.1.zip.sha1

Added: release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip
==
Binary file - no diff available.

Propchange: release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.asc
==
--- release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.asc (added)
+++ release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.asc Wed Apr 27 
05:30:53 2016
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+iEYEABECAAYFAlcbxssACgkQEsNbR247WibnqwCfW8v2FYlAm+npI4ZMyqmprySz
+qFgAni+iy2gTioArdtOZgFhEwA+1hljH
+=l0j+
+-END PGP SIGNATURE-

Added: release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.md5
==
--- release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.md5 (added)
+++ release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.md5 Wed Apr 27 
05:30:53 2016
@@ -0,0 +1 @@
+08c3bffbff2948c9821eb08c2809c7c8
\ No newline at end of file

Added: release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.sha1
==
--- release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.sha1 (added)
+++ release/deltaspike/1.6.1/deltaspike-1.6.1-source-release.zip.sha1 Wed Apr 
27 05:30:53 2016
@@ -0,0 +1 @@
+815f5ed0f014c433e52d583c3b4ed581654644eb
\ No newline at end of file

Added: release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz
==
Binary file - no diff available.

Propchange: release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.asc
==
--- release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.asc (added)
+++ release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.asc Wed Apr 27 
05:30:53 2016
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+iEYEABECAAYFAlcb0pEACgkQEsNbR247WiYLaQCfVwawQlqnlNYZ34ANvExYXV31
+AmoAniF7+Nb4Vy3XrAA+PEYcE0d4eChD
+=o+o2
+-END PGP SIGNATURE-

Added: release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.md5
==
--- release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.md5 (added)
+++ release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.md5 Wed Apr 27 
05:30:53 2016
@@ -0,0 +1 @@
+bd81f4e56895564c318b39f680f05a81
\ No newline at end of file

Added: release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.sha1
==
--- release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.sha1 (added)
+++ release/deltaspike/1.6.1/distribution-full-1.6.1.tar.gz.sha1 Wed Apr 27 
05:30:53 2016
@@ -0,0 +1 @@
+276c87603d444dbba62ba9f4c076dc0ff20034cd
\ No newline at end of file

Added: release/deltaspike/1.6.1/distribution-full-1.6.1.zip
==
Binary file - no diff available.

Propchange: release/deltaspike/1.6.1/distribution-full-1.6.1.zip
--
svn:mime-type = application/octet-stream

Added: release/deltaspike/1.6.1/distribution-full-1.6.1.zip.asc
==
--- release/deltaspike/1.6.1/distribution-full-1.6.1.zip.asc (added)
+++ release/deltaspike/1.6.1/distribution-full-1.6.1.zip.asc Wed

[3/3] deltaspike git commit: Merge branch ds-1.6.1

[gpetracek]

Merge branch ds-1.6.1


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2e31a27a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2e31a27a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2e31a27a

Branch: refs/heads/master
Commit: 2e31a27a4184650759f20bf27ca5cafd408f2a90
Parents: 3e7a13f 99f2e3c
Author: gpetracek <gpetra...@apache.org>
Authored: Wed Apr 27 06:30:10 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Wed Apr 27 06:30:10 2016 +0200

--
 deltaspike/cdictrl/api/pom.xml   | 2 +-
 deltaspike/cdictrl/impl-openejb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-owb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-weld/pom.xml | 2 +-
 deltaspike/cdictrl/pom.xml   | 2 +-
 deltaspike/cdictrl/servlet/pom.xml   | 2 +-
 deltaspike/cdictrl/tck/pom.xml   | 2 +-
 deltaspike/checkstyle-rules/pom.xml  | 2 +-
 deltaspike/core/api/pom.xml  | 2 +-
 deltaspike/core/impl/pom.xml | 2 +-
 deltaspike/core/pom.xml  | 2 +-
 deltaspike/dist/bom/pom.xml  | 4 ++--
 deltaspike/dist/full/pom.xml | 2 +-
 deltaspike/dist/pom.xml  | 4 ++--
 deltaspike/examples/jse-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-playground/pom.xml   | 2 +-
 deltaspike/examples/pom.xml  | 2 +-
 deltaspike/examples/scheduler-playground/pom.xml | 2 +-
 .../examples/security-requested-page-after-login-cdi/pom.xml | 2 +-
 .../security-requested-page-after-login-picketlink/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/api/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/impl/pom.xml  | 2 +-
 deltaspike/modules/bean-validation/pom.xml   | 4 ++--
 deltaspike/modules/data/api/pom.xml  | 2 +-
 deltaspike/modules/data/impl/pom.xml | 2 +-
 deltaspike/modules/data/pom.xml  | 2 +-
 deltaspike/modules/jpa/api/pom.xml   | 2 +-
 deltaspike/modules/jpa/impl/pom.xml  | 2 +-
 deltaspike/modules/jpa/pom.xml   | 4 ++--
 deltaspike/modules/jsf/api/pom.xml   | 2 +-
 deltaspike/modules/jsf/impl-ee6/pom.xml  | 2 +-
 deltaspike/modules/jsf/impl/pom.xml  | 2 +-
 deltaspike/modules/jsf/pom.xml   | 4 ++--
 deltaspike/modules/partial-bean/api/pom.xml  | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml | 2 +-
 deltaspike/modules/partial-bean/pom.xml  | 4 ++--
 deltaspike/modules/pom.xml   | 4 ++--
 deltaspike/modules/proxy/api/pom.xml | 2 +-
 deltaspike/modules/proxy/impl-asm5/pom.xml   | 2 +-
 deltaspike/modules/proxy/pom.xml | 4 ++--
 deltaspike/modules/scheduler/api/pom.xml | 2 +-
 deltaspike/modules/scheduler/impl/pom.xml| 2 +-
 deltaspike/modules/scheduler/pom.xml | 4 ++--
 deltaspike/modules/security/api/pom.xml  | 2 +-
 deltaspike/modules/security/impl/pom.xml | 2 +-
 deltaspike/modules/security/pom.xml  | 4 ++--
 deltaspike/modules/servlet/api/pom.xml   | 2 +-
 deltaspike/modules/servlet/impl/pom.xml  | 2 +-
 deltaspike/modules/servlet/pom.xml   | 4 ++--
 deltaspike/modules/test-control/api/pom.xml  | 2 +-
 deltaspike/modules/test-control/impl/pom.xml | 2 +-
 deltaspike/modules/test-control/pom.xml  | 4 ++--
 deltaspike/parent/code/pom.xml   | 2 +-
 deltaspike/parent/pom.xml| 2 +-
 deltaspike/pom.xml   | 4 ++--
 deltaspike/test-utils/pom.xml| 2 +-
 documentation/pom.xml| 4 ++--
 pom.xml  | 2 +-
 

[1/3] deltaspike git commit: [maven-release-plugin] prepare release deltaspike-1.6.1

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 3e7a13f09 -> 2e31a27a4


[maven-release-plugin] prepare release deltaspike-1.6.1


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7aa84402
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7aa84402
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7aa84402

Branch: refs/heads/master
Commit: 7aa8440229be379163f1b9a0e5f6c61d5e0e7070
Parents: 617a023
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 23 21:01:10 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 23 21:01:10 2016 +0200

--
 deltaspike/cdictrl/api/pom.xml   | 2 +-
 deltaspike/cdictrl/impl-openejb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-owb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-weld/pom.xml | 2 +-
 deltaspike/cdictrl/pom.xml   | 2 +-
 deltaspike/cdictrl/servlet/pom.xml   | 2 +-
 deltaspike/cdictrl/tck/pom.xml   | 2 +-
 deltaspike/checkstyle-rules/pom.xml  | 2 +-
 deltaspike/core/api/pom.xml  | 2 +-
 deltaspike/core/impl/pom.xml | 2 +-
 deltaspike/core/pom.xml  | 2 +-
 deltaspike/dist/bom/pom.xml  | 4 ++--
 deltaspike/dist/full/pom.xml | 2 +-
 deltaspike/dist/pom.xml  | 4 ++--
 deltaspike/examples/jse-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-playground/pom.xml   | 2 +-
 deltaspike/examples/pom.xml  | 2 +-
 deltaspike/examples/scheduler-playground/pom.xml | 2 +-
 .../examples/security-requested-page-after-login-cdi/pom.xml | 2 +-
 .../security-requested-page-after-login-picketlink/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/api/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/impl/pom.xml  | 2 +-
 deltaspike/modules/bean-validation/pom.xml   | 4 ++--
 deltaspike/modules/data/api/pom.xml  | 2 +-
 deltaspike/modules/data/impl/pom.xml | 2 +-
 deltaspike/modules/data/pom.xml  | 2 +-
 deltaspike/modules/jpa/api/pom.xml   | 2 +-
 deltaspike/modules/jpa/impl/pom.xml  | 2 +-
 deltaspike/modules/jpa/pom.xml   | 4 ++--
 deltaspike/modules/jsf/api/pom.xml   | 2 +-
 deltaspike/modules/jsf/impl-ee6/pom.xml  | 2 +-
 deltaspike/modules/jsf/impl/pom.xml  | 2 +-
 deltaspike/modules/jsf/pom.xml   | 4 ++--
 deltaspike/modules/partial-bean/api/pom.xml  | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml | 2 +-
 deltaspike/modules/partial-bean/pom.xml  | 4 ++--
 deltaspike/modules/pom.xml   | 4 ++--
 deltaspike/modules/proxy/api/pom.xml | 2 +-
 deltaspike/modules/proxy/impl-asm5/pom.xml   | 2 +-
 deltaspike/modules/proxy/pom.xml | 4 ++--
 deltaspike/modules/scheduler/api/pom.xml | 2 +-
 deltaspike/modules/scheduler/impl/pom.xml| 2 +-
 deltaspike/modules/scheduler/pom.xml | 4 ++--
 deltaspike/modules/security/api/pom.xml  | 2 +-
 deltaspike/modules/security/impl/pom.xml | 2 +-
 deltaspike/modules/security/pom.xml  | 4 ++--
 deltaspike/modules/servlet/api/pom.xml   | 2 +-
 deltaspike/modules/servlet/impl/pom.xml  | 2 +-
 deltaspike/modules/servlet/pom.xml   | 4 ++--
 deltaspike/modules/test-control/api/pom.xml  | 2 +-
 deltaspike/modules/test-control/impl/pom.xml | 2 +-
 deltaspike/modules/test-control/pom.xml  | 4 ++--
 deltaspike/parent/code/pom.xml   | 2 +-
 deltaspike/parent/pom.xml| 2 +-
 deltaspike/pom.xml   | 4 ++--
 deltaspike/test-utils/pom.xml| 2 +-
 docume

[2/3] deltaspike git commit: [maven-release-plugin] prepare for next development iteration

[gpetracek]

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/99f2e3c1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/99f2e3c1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/99f2e3c1

Branch: refs/heads/master
Commit: 99f2e3c161b3b6acbf46cdaa9ab45762973ef397
Parents: 7aa8440
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 23 21:01:21 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 23 21:01:21 2016 +0200

--
 deltaspike/cdictrl/api/pom.xml   | 2 +-
 deltaspike/cdictrl/impl-openejb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-owb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-weld/pom.xml | 2 +-
 deltaspike/cdictrl/pom.xml   | 2 +-
 deltaspike/cdictrl/servlet/pom.xml   | 2 +-
 deltaspike/cdictrl/tck/pom.xml   | 2 +-
 deltaspike/checkstyle-rules/pom.xml  | 2 +-
 deltaspike/core/api/pom.xml  | 2 +-
 deltaspike/core/impl/pom.xml | 2 +-
 deltaspike/core/pom.xml  | 2 +-
 deltaspike/dist/bom/pom.xml  | 4 ++--
 deltaspike/dist/full/pom.xml | 2 +-
 deltaspike/dist/pom.xml  | 4 ++--
 deltaspike/examples/jse-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-playground/pom.xml   | 2 +-
 deltaspike/examples/pom.xml  | 2 +-
 deltaspike/examples/scheduler-playground/pom.xml | 2 +-
 .../examples/security-requested-page-after-login-cdi/pom.xml | 2 +-
 .../security-requested-page-after-login-picketlink/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/api/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/impl/pom.xml  | 2 +-
 deltaspike/modules/bean-validation/pom.xml   | 4 ++--
 deltaspike/modules/data/api/pom.xml  | 2 +-
 deltaspike/modules/data/impl/pom.xml | 2 +-
 deltaspike/modules/data/pom.xml  | 2 +-
 deltaspike/modules/jpa/api/pom.xml   | 2 +-
 deltaspike/modules/jpa/impl/pom.xml  | 2 +-
 deltaspike/modules/jpa/pom.xml   | 4 ++--
 deltaspike/modules/jsf/api/pom.xml   | 2 +-
 deltaspike/modules/jsf/impl-ee6/pom.xml  | 2 +-
 deltaspike/modules/jsf/impl/pom.xml  | 2 +-
 deltaspike/modules/jsf/pom.xml   | 4 ++--
 deltaspike/modules/partial-bean/api/pom.xml  | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml | 2 +-
 deltaspike/modules/partial-bean/pom.xml  | 4 ++--
 deltaspike/modules/pom.xml   | 4 ++--
 deltaspike/modules/proxy/api/pom.xml | 2 +-
 deltaspike/modules/proxy/impl-asm5/pom.xml   | 2 +-
 deltaspike/modules/proxy/pom.xml | 4 ++--
 deltaspike/modules/scheduler/api/pom.xml | 2 +-
 deltaspike/modules/scheduler/impl/pom.xml| 2 +-
 deltaspike/modules/scheduler/pom.xml | 4 ++--
 deltaspike/modules/security/api/pom.xml  | 2 +-
 deltaspike/modules/security/impl/pom.xml | 2 +-
 deltaspike/modules/security/pom.xml  | 4 ++--
 deltaspike/modules/servlet/api/pom.xml   | 2 +-
 deltaspike/modules/servlet/impl/pom.xml  | 2 +-
 deltaspike/modules/servlet/pom.xml   | 4 ++--
 deltaspike/modules/test-control/api/pom.xml  | 2 +-
 deltaspike/modules/test-control/impl/pom.xml | 2 +-
 deltaspike/modules/test-control/pom.xml  | 4 ++--
 deltaspike/parent/code/pom.xml   | 2 +-
 deltaspike/parent/pom.xml| 2 +-
 deltaspike/pom.xml   | 4 ++--
 deltaspike/test-utils/pom.xml| 2 +-
 documentation/pom.xml| 4 +

[deltaspike] Git Push Summary

[gpetracek]

Repository: deltaspike
Updated Tags:  refs/tags/deltaspike-1.6.1 [created] 60fa39b88

[2/2] deltaspike git commit: [maven-release-plugin] prepare for next development iteration

[gpetracek]

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/99f2e3c1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/99f2e3c1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/99f2e3c1

Branch: refs/heads/ds-1.6.1
Commit: 99f2e3c161b3b6acbf46cdaa9ab45762973ef397
Parents: 7aa8440
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 23 21:01:21 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 23 21:01:21 2016 +0200

--
 deltaspike/cdictrl/api/pom.xml   | 2 +-
 deltaspike/cdictrl/impl-openejb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-owb/pom.xml  | 2 +-
 deltaspike/cdictrl/impl-weld/pom.xml | 2 +-
 deltaspike/cdictrl/pom.xml   | 2 +-
 deltaspike/cdictrl/servlet/pom.xml   | 2 +-
 deltaspike/cdictrl/tck/pom.xml   | 2 +-
 deltaspike/checkstyle-rules/pom.xml  | 2 +-
 deltaspike/core/api/pom.xml  | 2 +-
 deltaspike/core/impl/pom.xml | 2 +-
 deltaspike/core/pom.xml  | 2 +-
 deltaspike/dist/bom/pom.xml  | 4 ++--
 deltaspike/dist/full/pom.xml | 2 +-
 deltaspike/dist/pom.xml  | 4 ++--
 deltaspike/examples/jse-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-examples/pom.xml | 2 +-
 deltaspike/examples/jsf-playground/pom.xml   | 2 +-
 deltaspike/examples/pom.xml  | 2 +-
 deltaspike/examples/scheduler-playground/pom.xml | 2 +-
 .../examples/security-requested-page-after-login-cdi/pom.xml | 2 +-
 .../security-requested-page-after-login-picketlink/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/api/pom.xml   | 2 +-
 deltaspike/modules/bean-validation/impl/pom.xml  | 2 +-
 deltaspike/modules/bean-validation/pom.xml   | 4 ++--
 deltaspike/modules/data/api/pom.xml  | 2 +-
 deltaspike/modules/data/impl/pom.xml | 2 +-
 deltaspike/modules/data/pom.xml  | 2 +-
 deltaspike/modules/jpa/api/pom.xml   | 2 +-
 deltaspike/modules/jpa/impl/pom.xml  | 2 +-
 deltaspike/modules/jpa/pom.xml   | 4 ++--
 deltaspike/modules/jsf/api/pom.xml   | 2 +-
 deltaspike/modules/jsf/impl-ee6/pom.xml  | 2 +-
 deltaspike/modules/jsf/impl/pom.xml  | 2 +-
 deltaspike/modules/jsf/pom.xml   | 4 ++--
 deltaspike/modules/partial-bean/api/pom.xml  | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml | 2 +-
 deltaspike/modules/partial-bean/pom.xml  | 4 ++--
 deltaspike/modules/pom.xml   | 4 ++--
 deltaspike/modules/proxy/api/pom.xml | 2 +-
 deltaspike/modules/proxy/impl-asm5/pom.xml   | 2 +-
 deltaspike/modules/proxy/pom.xml | 4 ++--
 deltaspike/modules/scheduler/api/pom.xml | 2 +-
 deltaspike/modules/scheduler/impl/pom.xml| 2 +-
 deltaspike/modules/scheduler/pom.xml | 4 ++--
 deltaspike/modules/security/api/pom.xml  | 2 +-
 deltaspike/modules/security/impl/pom.xml | 2 +-
 deltaspike/modules/security/pom.xml  | 4 ++--
 deltaspike/modules/servlet/api/pom.xml   | 2 +-
 deltaspike/modules/servlet/impl/pom.xml  | 2 +-
 deltaspike/modules/servlet/pom.xml   | 4 ++--
 deltaspike/modules/test-control/api/pom.xml  | 2 +-
 deltaspike/modules/test-control/impl/pom.xml | 2 +-
 deltaspike/modules/test-control/pom.xml  | 4 ++--
 deltaspike/parent/code/pom.xml   | 2 +-
 deltaspike/parent/pom.xml| 2 +-
 deltaspike/pom.xml   | 4 ++--
 deltaspike/test-utils/pom.xml| 2 +-
 documentation/pom.xml| 4 +

deltaspike git commit: DELTASPIKE-1132 release notes for v1.6.1

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 67ed43ba6 -> 617a023fa


DELTASPIKE-1132 release notes for v1.6.1


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/617a023f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/617a023f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/617a023f

Branch: refs/heads/master
Commit: 617a023fa2e4c1d7c1b236bef70dab71f49f2e8d
Parents: 67ed43b
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 23 12:02:37 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 23 12:02:37 2016 +0200

--
 deltaspike/readme/ReleaseNotes-1.6.1.txt | 27 +++
 1 file changed, 27 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/617a023f/deltaspike/readme/ReleaseNotes-1.6.1.txt
--
diff --git a/deltaspike/readme/ReleaseNotes-1.6.1.txt 
b/deltaspike/readme/ReleaseNotes-1.6.1.txt
new file mode 100644
index 000..388fd20
--- /dev/null
+++ b/deltaspike/readme/ReleaseNotes-1.6.1.txt
@@ -0,0 +1,27 @@
+Release Notes - Apache DeltaSpike - Version 1.6.1
+
+Improvement
+
+[DELTASPIKE-1113] - WindowIdHtmlRenderer should skip DELEGATED
+[DELTASPIKE-1116] - allow conditional injection-point customization in 
test-classes
+[DELTASPIKE-1118] - ThrottledInterceptor needs to use an 
InterceptorStrategy
+[DELTASPIKE-1119] - FutureableInterceptor needs to use an 
InterceptorStrategy
+[DELTASPIKE-1120] - LockedInterceptor needs to use an InterceptorStrategy
+[DELTASPIKE-1124] - optimize internal handling of cron-config updates
+[DELTASPIKE-1125] - make ParentExtension mechanism configurable
+[DELTASPIKE-1130] - improve cdi-ctrl-tck
+[DELTASPIKE-1131] - improve MockHttpSession
+
+New Feature
+
+[DELTASPIKE-1117] - add cache(long ms) to ConfigResolver.TypedResolver
+[DELTASPIKE-1126] - variable support in ConfigResolver
+
+Task
+
+[DELTASPIKE-1006] - document @Transactional and @TransactionScoped support 
for @Repository
+[DELTASPIKE-1032] - document creating quartz scheduling jobs at runtime
+[DELTASPIKE-1112] - Document - getting started w/ DeltaSpike using Gradle
+[DELTASPIKE-1114] - update site and javadoc to 1.6.0
+[DELTASPIKE-1128] - add deltaspike.future.timeout to CoreBaseConfig
+[DELTASPIKE-1132] - prepare v1.6.1
\ No newline at end of file

deltaspike git commit: DELTASPIKE-1116 allow conditional replacement of injection-points in test-classes

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 8f9441fcb -> 67ed43ba6


DELTASPIKE-1116 allow conditional replacement of injection-points in 
test-classes


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/67ed43ba
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/67ed43ba
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/67ed43ba

Branch: refs/heads/master
Commit: 67ed43ba687466a4c7b3aea20de9e5a12bd50641
Parents: 8f9441f
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 23 11:34:24 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 23 11:34:24 2016 +0200

--
 .../deltaspike/testcontrol/api/junit/CdiTestRunner.java  |  7 ++-
 .../deltaspike/testcontrol/api/junit/TestBaseConfig.java | 11 +++
 2 files changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ed43ba/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index 2baf5a5..8cd2593 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -78,12 +78,14 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 private static final Logger LOGGER = 
Logger.getLogger(CdiTestRunner.class.getName());
 
 private static final boolean USE_TEST_CLASS_AS_CDI_BEAN;
+private static final boolean ALLOW_INJECTION_POINT_MANIPULATION;
 
 private static Set notifierIdentities = new 
CopyOnWriteArraySet();
 
 static
 {
 USE_TEST_CLASS_AS_CDI_BEAN = 
TestBaseConfig.ContainerIntegration.USE_TEST_CLASS_AS_CDI_BEAN;
+ALLOW_INJECTION_POINT_MANIPULATION = 
TestBaseConfig.MockIntegration.ALLOW_MANUAL_INJECTION_POINT_MANIPULATION;
 }
 
 private static ThreadLocal automaticScopeHandlingActive = new 
ThreadLocal();
@@ -309,7 +311,10 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 
 if (!USE_TEST_CLASS_AS_CDI_BEAN || beans == null || 
beans.isEmpty())
 {
-BeanProvider.injectFields(this.originalTarget); //fallback to 
simple injection
+if (!ALLOW_INJECTION_POINT_MANIPULATION)
+{
+BeanProvider.injectFields(this.originalTarget); //fallback 
to simple injection
+}
 invokeMethod(this.originalTarget);
 }
 else

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ed43ba/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
--
diff --git 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
index 7c1c70f..35c8d36 100644
--- 
a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
+++ 
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
@@ -43,6 +43,8 @@ public interface TestBaseConfig extends DeltaSpikeBaseConfig
 {
 String ALLOW_MOCKED_BEANS_KEY = 
"deltaspike.testcontrol.mock-support.allow_mocked_beans";
 String ALLOW_MOCKED_PRODUCERS_KEY = 
"deltaspike.testcontrol.mock-support.allow_mocked_producers";
+String ALLOW_MANUAL_INJECTION_POINT_MANIPULATION_KEY =
+
"deltaspike.testcontrol.mock-support.allow_manual_injection-point_manipulation";
 
 Boolean ALLOW_MOCKED_BEANS = 
ConfigResolver.resolve(ALLOW_MOCKED_BEANS_KEY)
 .as(Boolean.class)
@@ -56,5 +58,14 @@ public interface TestBaseConfig extends DeltaSpikeBaseConfig
 .withDefault(Boolean.FALSE)
 .getValue();
 
+//if enabled it's possible to change the value of injection-points 
after the injection-process and
+//before test-execution. that allows to replace injection-points (e.g. 
with a mock) conditionally
+//via a test-rule or @Before
+Boolean ALLOW_MANUAL_INJECTION_POINT_MANIPULATION =
+
ConfigResolver.resolve(

[2/2] deltaspike git commit: DELTASPIKE-1130 check session after starting a new request

[gpetracek]

DELTASPIKE-1130 check session after starting a new request


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/83dd59c2
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/83dd59c2
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/83dd59c2

Branch: refs/heads/master
Commit: 83dd59c218ff938e3e0ee861c017b03feae55620
Parents: a330151
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 22 11:21:24 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 22 11:57:54 2016 +0200

--
 .../cdise/tck/ContainerCtrlTckTest.java | 78 
 1 file changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/83dd59c2/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
--
diff --git 
a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
 
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
index 2160f5b..536508b 100644
--- 
a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
+++ 
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
@@ -271,4 +271,82 @@ public class ContainerCtrlTckTest
 
 cdiContainer.shutdown();
 }
+
+@Test
+public void testNewRequests()
+{
+CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
+Assert.assertNotNull(cdiContainer);
+
+cdiContainer.boot();
+cdiContainer.getContextControl().startContext(SessionScoped.class);
+cdiContainer.getContextControl().startContext(RequestScoped.class);
+
+BeanManager beanManager = cdiContainer.getBeanManager();
+Assert.assertNotNull(beanManager);
+
+TestUser testUser = resolveInstance(beanManager, TestUser.class);
+
+Assert.assertNotNull(testUser);
+testUser.setName("tester");
+
+
+CarRepair carRepair = resolveInstance(beanManager, CarRepair.class);
+
+Assert.assertNotNull(carRepair);
+
+Car car = carRepair.getCar();
+
+Assert.assertNotNull(car);
+Assert.assertNotNull(car.getUser());
+Assert.assertEquals("tester", car.getUser().getName());
+
+
+carRepair.getCar().getUser().setName("tck-tester");
+Assert.assertEquals("tck-tester", testUser.getName());
+
+cdiContainer.getContextControl().stopContext(RequestScoped.class);
+cdiContainer.getContextControl().startContext(RequestScoped.class);
+
+try
+{
+testUser = resolveInstance(beanManager, TestUser.class);
+
+Assert.assertNotNull(testUser);
+Assert.assertNotNull(testUser.getName());
+Assert.assertEquals("tck-tester", testUser.getName());
+}
+catch (ContextNotActiveException e)
+{
+Assert.fail(e.getMessage());
+}
+
+try
+{
+carRepair = resolveInstance(beanManager, CarRepair.class);
+
+Assert.assertNotNull(carRepair);
+
+car = carRepair.getCar();
+
+Assert.assertNotNull(car);
+Assert.assertNotNull(car.getUser());
+Assert.assertNotNull(car.getUser().getName());
+Assert.assertEquals("tck-tester", car.getUser().getName());
+}
+catch (ContextNotActiveException e)
+{
+Assert.fail(e.getMessage());
+}
+
+cdiContainer.shutdown();
+}
+
+private  T resolveInstance(BeanManager beanManager, Class beanClass)
+{
+Set<Bean> beans = beanManager.getBeans(beanClass);
+Bean bean = beanManager.resolve(beans);
+
+return (T) beanManager.getReference(bean, beanClass, 
beanManager.createCreationalContext(bean));
+}
 }

[1/2] deltaspike git commit: DELTASPIKE-1131 improved MockHttpSession

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master a33015198 -> 8f9441fcb


DELTASPIKE-1131 improved MockHttpSession


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8f9441fc
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8f9441fc
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8f9441fc

Branch: refs/heads/master
Commit: 8f9441fcb8211c85e5bcb421d1f644415ef4460c
Parents: 83dd59c
Author: gpetracek <gpetra...@apache.org>
Authored: Fri Apr 22 11:34:22 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Fri Apr 22 11:57:54 2016 +0200

--
 .../apache/deltaspike/cdise/owb/MockHttpSession.java   | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8f9441fc/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
--
diff --git 
a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
 
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
index 8ce7dea..33b276d 100644
--- 
a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
+++ 
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
@@ -19,6 +19,8 @@
 package org.apache.deltaspike.cdise.owb;
 
 import java.util.Enumeration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
@@ -31,6 +33,8 @@ public class MockHttpSession implements HttpSession
 {
 private String sessionId;
 
+private Map<String, Object> sessionMap = new ConcurrentHashMap<String, 
Object>();
+
 public MockHttpSession(String sessionId)
 {
 this.sessionId = sessionId;
@@ -72,12 +76,12 @@ public class MockHttpSession implements HttpSession
 
 public Object getAttribute(String name)
 {
-return null;
+return this.sessionMap.get(name);
 }
 
 public Object getValue(String name)
 {
-return null;
+return getAttribute(name);
 }
 
 public Enumeration getAttributeNames()
@@ -92,22 +96,27 @@ public class MockHttpSession implements HttpSession
 
 public void setAttribute(String name, Object value)
 {
+this.sessionMap.put(name, value);
 }
 
 public void putValue(String name, Object value)
 {
+setAttribute(name, value);
 }
 
 public void removeAttribute(String name)
 {
+this.sessionMap.remove(name);
 }
 
 public void removeValue(String name)
 {
+removeAttribute(name);
 }
 
 public void invalidate()
 {
+this.sessionMap.clear();
 }
 
 public boolean isNew()

svn commit: r986068 - /websites/production/deltaspike/content/

[gpetracek]

Author: gpetracek
Date: Tue Apr 19 09:12:17 2016
New Revision: 986068

Log:
Publishing svnmucc operation to deltaspike site by gpetracek

Added:
websites/production/deltaspike/content/
  - copied from r986067, websites/staging/deltaspike/trunk/content/

svn commit: r1739872 - in /deltaspike/site/trunk/content/documentation: configuration.html data.html scheduler.html

[gpetracek]

Author: gpetracek
Date: Tue Apr 19 09:02:52 2016
New Revision: 1739872

URL: http://svn.apache.org/viewvc?rev=1739872=rev
Log:
Site checkin for project Apache DeltaSpike Documentation

Modified:
deltaspike/site/trunk/content/documentation/configuration.html
deltaspike/site/trunk/content/documentation/data.html
deltaspike/site/trunk/content/documentation/scheduler.html

Modified: deltaspike/site/trunk/content/documentation/configuration.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/configuration.html?rev=1739872=1739871=1739872=diff
==
--- deltaspike/site/trunk/content/documentation/configuration.html (original)
+++ deltaspike/site/trunk/content/documentation/configuration.html Tue Apr 19 
09:02:52 2016
@@ -486,6 +486,27 @@ to change dynamically if someone likes t
 
 
 
+Variable Replacement in 
Configured Values
+
+Since version 1.6.1, DeltaSpike also supports using 'variables' inside 
configured values.
+You can e.g. define a single configuration key for your server and use it in 
other configuration values
+
+
+
+document.server.url=http://localhost:8081
+myapp.document.lists=${document.server.url}/docapp/list
+myapp.document.admin=${document.server.url}/docadmin/app
+
+
+
+A variable name starts with ${ and ends with 
}.
+
+
+Variable support is enabled by default.
+If you like to use the ConfigResolver without variable support 
you need to use the methods with the evaluateVariables parameter 
set to false.
+
+
+
 TypedResolver API
 
 Very often the configured values represent more than just 
stringsnumber types and booleans are commonly used as
@@ -952,6 +973,7 @@ log.
 Handling of Default Values
 
 
+Variable Replacement 
in Configured Values
 TypedResolver API
 
 Supported types

Modified: deltaspike/site/trunk/content/documentation/data.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/data.html?rev=1739872=1739871=1739872=diff
==
--- deltaspike/site/trunk/content/documentation/data.html (original)
+++ deltaspike/site/trunk/content/documentation/data.html Tue Apr 19 09:02:52 
2016
@@ -605,6 +605,86 @@ be implemented in the repository.
 
 
 
+Support of 
@TransactionScoped EntityManagers
+
+For using @TransactionScoped beans like a 
@TransactionScoped-EntityManager,
+you need to annotate the Data-repository with @Transactional explicitly or one 
of the beans in the call-hierarchy.
+Thats needed, because the context bound to 
@TransactionScoped needs to be active,
+before the @TransactionScoped-EntityManager gets 
resolved (internally).
+
+
+The following examples illustrate the described usages:
+
+
+@TransactionScoped EntityManager combined with a simple 
repository
+
+public class EntityManagerProducer
+{
+@Produces
+@TransactionScoped
+public EntityManager create() { ... }
+
+public void 
close(@Disposes EntityManager em)  { ... }
+}
+
+@ApplicationScoped
+public class MyService
+{
+@Inject
+private MyRepository myRepository;
+
+public void 
create()
+{
+//...
+this.myRepository.save(...); //executed in a transaction
+//...
+}
+}
+
+@Transactional
+@Repository
+public interface 
MyRepository extends 
EntityRepositoryMyEntity, String
+{
+  //...
+}
+
+
+
+@TransactionScoped EntityManager combined with a simple 
repository called by a transactional bean
+
+public class EntityManagerProducer
+{
+@Produces
+@TransactionScoped
+public EntityManager create() { ... }
+
+public void 
close(@Disposes EntityManager em)  { ... }
+}
+
+@Transactional
+@ApplicationScoped
+public class MyService
+{
+@Inject
+private MyRepository myRepository;
+
+public void 
create() //executed in a transaction
+{
+//...
+this.myRepository.save(...);
+//...
+}
+}
+
+@Repository
+public interface 
MyRepository extends 
EntityRepositoryMyEntity, String
+{
+  //...
+}
+
+
+
+
 Using Multiple EntityManagers
 
 While most applications will run just fine with a single
@@ -2148,6 +2228,7 @@ provider when persisting / updating the
 
 
 Deactivating Repositories
+Support of 
@TransactionScoped EntityManagers
 Using Multiple 
EntityManagers
 Other EntityManager 
Methods
 

Modified: deltaspike/site/trunk/content/documentation/scheduler.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/scheduler.html?rev=1739872=1739871=1739872=diff
==
--- deltaspike/site/trunk/content/documentation/scheduler.html (original)
+++ deltaspike/site/trunk/content/documentation/scheduler.html Tue Apr 19 
09:02:52 2016
@@ -545,6 +545,36 @@ start a job once (without registering it
 
 
 
+Manual scheduling
+
+
+If the SPI provided by 
org.apache.deltaspike.scheduler.spi.Scheduler doesnt 
provide a method

svn commit: r1739869 - in /deltaspike/site/trunk/content/staging/documentation: configuration.html core.html data.html scheduler.html

[gpetracek]

Author: gpetracek
Date: Tue Apr 19 08:51:18 2016
New Revision: 1739869

URL: http://svn.apache.org/viewvc?rev=1739869=rev
Log:
Site checkin for project Apache DeltaSpike Documentation

Modified:
deltaspike/site/trunk/content/staging/documentation/configuration.html
deltaspike/site/trunk/content/staging/documentation/core.html
deltaspike/site/trunk/content/staging/documentation/data.html
deltaspike/site/trunk/content/staging/documentation/scheduler.html

Modified: deltaspike/site/trunk/content/staging/documentation/configuration.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/configuration.html?rev=1739869=1739868=1739869=diff
==
--- deltaspike/site/trunk/content/staging/documentation/configuration.html 
(original)
+++ deltaspike/site/trunk/content/staging/documentation/configuration.html Tue 
Apr 19 08:51:18 2016
@@ -486,6 +486,27 @@ to change dynamically if someone likes t
 
 
 
+Variable Replacement in 
Configured Values
+
+Since version 1.6.1, DeltaSpike also supports using 'variables' inside 
configured values.
+You can e.g. define a single configuration key for your server and use it in 
other configuration values
+
+
+
+document.server.url=http://localhost:8081
+myapp.document.lists=${document.server.url}/docapp/list
+myapp.document.admin=${document.server.url}/docadmin/app
+
+
+
+A variable name starts with ${ and ends with 
}.
+
+
+Variable support is enabled by default.
+If you like to use the ConfigResolver without variable support 
you need to use the methods with the evaluateVariables parameter 
set to false.
+
+
+
 TypedResolver API
 
 Very often the configured values represent more than just 
stringsnumber types and booleans are commonly used as
@@ -952,6 +973,7 @@ log.
 Handling of Default Values
 
 
+Variable Replacement 
in Configured Values
 TypedResolver API
 
 Supported types

Modified: deltaspike/site/trunk/content/staging/documentation/core.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/core.html?rev=1739869=1739868=1739869=diff
==
--- deltaspike/site/trunk/content/staging/documentation/core.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/core.html Tue Apr 19 
08:51:18 2016
@@ -1756,6 +1756,27 @@ The following example shows how it would
 
 
 
+Asynchronous Operations
+
+
+DeltaSpike provides support for executing code in an asynchronous manner.  
The behavior is implemented as three different interceptors for your beans.
+
+
+
+
+@Futreable - Designed for bean methods that return 
Futures of some form.  The method call will automatically 
be submitted to an ExecutorService
+
+
+@Locked - Ability to prevent concurrent access to a method 
based on its usage of reads/writes.
+
+
+@Throttled - Ability to limit how frequently a method can be 
invoked.
+
+
+
+
+
+
 Utilities
 
 
@@ -2012,6 +2033,7 @@ objects, the last object in the array wi
 Deactivate 
Deactivatable-Classes via Config
 
 
+Asynchronous Operations
 Utilities
 
 AnnotationUtils

Modified: deltaspike/site/trunk/content/staging/documentation/data.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/data.html?rev=1739869=1739868=1739869=diff
==
--- deltaspike/site/trunk/content/staging/documentation/data.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/data.html Tue Apr 19 
08:51:18 2016
@@ -605,6 +605,86 @@ be implemented in the repository.
 
 
 
+Support of 
@TransactionScoped EntityManagers
+
+For using @TransactionScoped beans like a 
@TransactionScoped-EntityManager,
+you need to annotate the Data-repository with @Transactional explicitly or one 
of the beans in the call-hierarchy.
+Thats needed, because the context bound to 
@TransactionScoped needs to be active,
+before the @TransactionScoped-EntityManager gets 
resolved (internally).
+
+
+The following examples illustrate the described usages:
+
+
+@TransactionScoped EntityManager combined with a simple 
repository
+
+public class EntityManagerProducer
+{
+@Produces
+@TransactionScoped
+public EntityManager create() { ... }
+
+public void 
close(@Disposes EntityManager em)  { ... }
+}
+
+@ApplicationScoped
+public class MyService
+{
+@Inject
+private MyRepository myRepository;
+
+public void 
create()
+{
+//...
+this.myRepository.save(...); //executed in a transaction
+//...
+}
+}
+
+@Transactional
+@Repository
+public interface 
MyRepository extends 
EntityRepositoryMyEntity, String
+{
+  //...
+}
+
+
+
+@TransactionScoped EntityManager combined with a simple 
repository called by a transactional bean
+
+public class EntityManagerProducer
+{
+@Produces
+@TransactionScoped
+public

deltaspike git commit: DELTASPIKE-1128 moved timeout-config to CoreBaseConfig

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 68939f30a -> 9c8c62d2c


DELTASPIKE-1128 moved timeout-config to CoreBaseConfig


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9c8c62d2
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9c8c62d2
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9c8c62d2

Branch: refs/heads/master
Commit: 9c8c62d2c14735737927c64f12fe3062c431422f
Parents: 68939f3
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 16 12:34:39 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 16 13:11:04 2016 +0200

--
 .../deltaspike/core/api/config/base/CoreBaseConfig.java | 12 
 .../deltaspike/core/impl/future/ThreadPoolManager.java  |  5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9c8c62d2/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
index 5156164..4831315 100644
--- 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
@@ -20,6 +20,8 @@ package org.apache.deltaspike.core.api.config.base;
 
 import org.apache.deltaspike.core.api.config.ConfigResolver;
 
+import java.util.concurrent.TimeUnit;
+
 public interface CoreBaseConfig extends DeltaSpikeBaseConfig
 {
 interface BeanManagerIntegration
@@ -88,4 +90,14 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig
 .getValue();
 }
 }
+
+interface TimeoutCustomization
+{
+Integer FUTUREABLE_TERMINATION_TIMEOUT_IN_MILLISECONDS =
+
ConfigResolver.resolve("deltaspike.futureable.termination-timeout_in_milliseconds")
+.as(Integer.class)
+.withCurrentProjectStage(true)
+.withDefault((int) TimeUnit.MINUTES.toMillis(1))
+.getValue();
+}
 }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9c8c62d2/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
index e1711a0..9dc6667 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
@@ -18,7 +18,7 @@
  */
 package org.apache.deltaspike.core.impl.future;
 
-import org.apache.deltaspike.core.api.config.ConfigResolver;
+import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
 
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
@@ -39,8 +39,7 @@ public class ThreadPoolManager
 private void shutdown()
 {
 closed = true;
-final String propertyValue = 
ConfigResolver.getPropertyValue("deltaspike.future.timeout");
-final long timeout = propertyValue == null ? 
TimeUnit.MINUTES.toMillis(1) : Integer.parseInt(propertyValue);
+final long timeout = 
CoreBaseConfig.TimeoutCustomization.FUTUREABLE_TERMINATION_TIMEOUT_IN_MILLISECONDS;
 for (final ExecutorService es : pools.values())
 {
 es.shutdown();

deltaspike git commit: DELTASPIKE-1032 added hints about manual scheduling

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 2018d4ed4 -> 68939f30a


DELTASPIKE-1032 added hints about manual scheduling


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/68939f30
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/68939f30
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/68939f30

Branch: refs/heads/master
Commit: 68939f30a2d55921d823b9232bb8cd914cfadb00
Parents: 2018d4e
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 16 11:41:03 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 16 11:45:18 2016 +0200

--
 documentation/src/main/asciidoc/scheduler.adoc | 25 +
 1 file changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/68939f30/documentation/src/main/asciidoc/scheduler.adoc
--
diff --git a/documentation/src/main/asciidoc/scheduler.adoc 
b/documentation/src/main/asciidoc/scheduler.adoc
index 88b7a14..2649ecf 100644
--- a/documentation/src/main/asciidoc/scheduler.adoc
+++ b/documentation/src/main/asciidoc/scheduler.adoc
@@ -237,6 +237,31 @@ or
 
 -
 
+== Manual scheduling
+
+If the SPI provided by `org.apache.deltaspike.scheduler.spi.Scheduler` doesn't 
provide a method you are looking for,
+you can use `#unwrap` to access the underlying scheduler.
+Per default DeltaSpike uses an implementation of `org.quartz.Scheduler`.
+Therefore, it's possible to inject 
`org.apache.deltaspike.scheduler.spi.Scheduler` and use it like in the 
following example:
+
+[source,java]
+--
+public class ManualJobScheduler
+{
+@Inject
+private Scheduler scheduler;
+
+@Override
+public void scheduleJob(JobDetail jobDetail, Trigger trigger) throws 
SchedulerException
+{
+
this.scheduler.unwrap(org.quartz.Scheduler.class).scheduleJob(jobDetail, 
trigger);
+}
+}
+--
+
+With that it's e.g. possible to schedule quartz-jobs based on the same 
quartz-job(-class), but with different triggers,...
+Also manually scheduled jobs benefit from DeltaSpike features like the support 
of `@Inject` in the job-instances.
+
 == Execute java.lang.Runnable with ManagedExecutorService
 
 If you would like to use e.g. the `ManagedExecutorService` (with EE7+) to run 
the jobs,

deltaspike git commit: DELTASPIKE-1006 added hints about @TransactionScoped entity-managers

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 2a6058c56 -> 6950f2542


DELTASPIKE-1006 added hints about @TransactionScoped entity-managers


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6950f254
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6950f254
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6950f254

Branch: refs/heads/master
Commit: 6950f2542ae48afd535a4817d49c7796ab8db34f
Parents: 2a6058c
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 16 10:47:54 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 16 10:48:26 2016 +0200

--
 documentation/src/main/asciidoc/data.adoc | 77 ++
 1 file changed, 77 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6950f254/documentation/src/main/asciidoc/data.adoc
--
diff --git a/documentation/src/main/asciidoc/data.adoc 
b/documentation/src/main/asciidoc/data.adoc
index 1a64188..6f7f76c 100644
--- a/documentation/src/main/asciidoc/data.adoc
+++ b/documentation/src/main/asciidoc/data.adoc
@@ -271,6 +271,83 @@ public interface PersonRepository implements Deactivatable{
 }
 
 
+=== Support of @TransactionScoped EntityManagers
+
+For using `@TransactionScoped` beans like a 
`@TransactionScoped`-`EntityManager`,
+you need to annotate the Data-repository with @Transactional explicitly or one 
of the beans in the call-hierarchy.
+That's needed, because the context bound to `@TransactionScoped` needs to be 
active,
+before the `@TransactionScoped`-`EntityManager` gets resolved (internally).
+
+The following examples illustrate the described usages:
+
+.@TransactionScoped EntityManager combined with a simple repository
+[source,java]
+---
+public class EntityManagerProducer
+{
+@Produces
+@TransactionScoped
+public EntityManager create() { ... }
+
+public void close(@Disposes EntityManager em)  { ... }
+}
+
+@ApplicationScoped
+public class MyService
+{
+@Inject
+private MyRepository myRepository;
+
+public void create()
+{
+//...
+this.myRepository.save(...); //executed in a transaction
+//...
+}
+}
+
+@Transactional
+@Repository
+public interface MyRepository extends EntityRepository<MyEntity, String>
+{
+  //...
+}
+---
+
+.@TransactionScoped EntityManager combined with a simple repository called by 
a transactional bean
+[source,java]
+---
+public class EntityManagerProducer
+{
+@Produces
+@TransactionScoped
+public EntityManager create() { ... }
+
+public void close(@Disposes EntityManager em)  { ... }
+}
+
+@Transactional
+@ApplicationScoped
+public class MyService
+{
+@Inject
+private MyRepository myRepository;
+
+public void create() //executed in a transaction
+{
+//...
+this.myRepository.save(...);
+//...
+}
+}
+
+@Repository
+public interface MyRepository extends EntityRepository<MyEntity, String>
+{
+  //...
+}
+---
+
 === Using Multiple EntityManagers
 
 While most applications will run just fine with a single

[3/3] deltaspike git commit: DELTASPIKE-1120 refactoring to LockedStrategy

[gpetracek]

DELTASPIKE-1120 refactoring to LockedStrategy


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/96319066
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/96319066
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/96319066

Branch: refs/heads/master
Commit: 9631906615f9c6b80675e960387dc465c453e595
Parents: 943cf54
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Apr 12 00:33:12 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Apr 12 01:02:12 2016 +0200

--
 .../core/spi/lock/LockedStrategy.java   |  25 
 .../core/impl/lock/DefaultLockedStrategy.java   |  47 +++
 .../deltaspike/core/impl/lock/LockSupplier.java |  26 
 .../core/impl/lock/LockSupplierStorage.java | 140 +++
 .../core/impl/lock/LockedInterceptor.java   | 134 +-
 5 files changed, 241 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/96319066/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/lock/LockedStrategy.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/lock/LockedStrategy.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/lock/LockedStrategy.java
new file mode 100644
index 000..bdfa0e1
--- /dev/null
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/lock/LockedStrategy.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.spi.lock;
+
+import org.apache.deltaspike.core.spi.InterceptorStrategy;
+
+public interface LockedStrategy extends InterceptorStrategy
+{
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/96319066/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
new file mode 100644
index 000..37ee5de
--- /dev/null
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.lock;
+
+import org.apache.deltaspike.core.spi.lock.LockedStrategy;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+import javax.interceptor.InvocationContext;
+import java.util.concurrent.locks.Lock;
+
+@Dependent
+public class DefaultLockedStrategy implements LockedStrategy
+{
+@Inject
+private LockSupplierStorage lockSupplierStorage;
+
+@Override
+public Object execute(InvocationContext ic) throws Exception
+{
+final Lock lock = lockSupplierStorage.getLockSupplier(ic).get();
+try
+{
+return ic.proceed();
+}
+finally
+{
+lock.unlock();
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/96

[1/3] deltaspike git commit: DELTASPIKE-1119 refactoring to FutureableStrategy

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master ac3d5829c -> 963190661


DELTASPIKE-1119 refactoring to FutureableStrategy


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/943cf54a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/943cf54a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/943cf54a

Branch: refs/heads/master
Commit: 943cf54a6838573ebf4ddf90988c12842a04b47e
Parents: 18e1af7
Author: gpetracek <gpetra...@apache.org>
Authored: Tue Apr 12 00:24:58 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Tue Apr 12 01:02:11 2016 +0200

--
 .../core/spi/future/FutureableStrategy.java |  25 ++
 .../impl/future/DefaultFutureableStrategy.java  | 155 ++
 .../core/impl/future/FutureableInterceptor.java | 280 +--
 .../impl/future/J8PromiseCompanionTask.java |  98 +++
 .../core/impl/future/ThreadPoolManager.java | 101 +++
 5 files changed, 383 insertions(+), 276 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/943cf54a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/future/FutureableStrategy.java
--
diff --git 
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/future/FutureableStrategy.java
 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/future/FutureableStrategy.java
new file mode 100644
index 000..4f2214f
--- /dev/null
+++ 
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/future/FutureableStrategy.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.spi.future;
+
+import org.apache.deltaspike.core.spi.InterceptorStrategy;
+
+public interface FutureableStrategy extends InterceptorStrategy
+{
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/943cf54a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
--
diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
new file mode 100644
index 000..7a51cc4
--- /dev/null
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.future;
+
+import org.apache.deltaspike.core.api.future.Futureable;
+import org.apache.deltaspike.core.impl.util.AnnotatedMethods;
+import org.apache.deltaspike.core.spi.future.FutureableStrategy;
+import org.apache.deltaspike.core.util.ExceptionUtils;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.interceptor.InvocationContext;
+import java.lang.reflect.InvocationTargetException;
+import java.lan

deltaspike git commit: DELTASPIKE-1124 optimized handling in case of DynamicExpressionObserverJob

[gpetracek]

Repository: deltaspike
Updated Branches:
  refs/heads/master 6bef4aca2 -> 16b77919b


DELTASPIKE-1124 optimized handling in case of DynamicExpressionObserverJob


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/16b77919
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/16b77919
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/16b77919

Branch: refs/heads/master
Commit: 16b77919b71b28eb2d4d06a2740c9aeec94cfe58
Parents: 6bef4ac
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 9 23:54:48 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 9 23:54:48 2016 +0200

--
 .../deltaspike/scheduler/impl/AbstractQuartzScheduler.java| 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/16b77919/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
--
diff --git 
a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
 
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
index f668b79..188682a 100644
--- 
a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
+++ 
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
@@ -446,11 +446,16 @@ public abstract class AbstractQuartzScheduler 
implements Scheduler
 Scheduled scheduled = jobClass.getAnnotation(Scheduled.class);
 
 //can happen with manually registered job-instances (via #unwrap)
-if (scheduled == null)
+if (scheduled == null && 
!jobClass.equals(DynamicExpressionObserverJob.class))
 {
 scheduled = DEFAULT_SCHEDULED_LITERAL;
 }
 
+if (scheduled == null)
+{
+return;
+}
+
 JobListenerContext jobListenerContext = new JobListenerContext();
 currentJobListenerContext.set(jobListenerContext);
 jobListenerContext.startContexts(scheduled);

svn commit: r13047 - /release/deltaspike/1.5.4/

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:31:59 2016
New Revision: 13047

Log:
cleanup

Removed:
release/deltaspike/1.5.4/

svn commit: r984895 - /websites/production/deltaspike/content/

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:32:27 2016
New Revision: 984895

Log:
Publishing svnmucc operation to deltaspike site by gpetracek

Added:
websites/production/deltaspike/content/
  - copied from r984894, websites/staging/deltaspike/trunk/content/

svn commit: r1737940 - in /deltaspike/site/trunk/content/javadoc/1.6.1-SNAPSHOT: ./ org/ org/apache/ org/apache/deltaspike/ org/apache/deltaspike/cdise/ org/apache/deltaspike/cdise/api/ org/apache/del

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:28:03 2016
New Revision: 1737940

URL: http://svn.apache.org/viewvc?rev=1737940=rev
Log:
Site checkin for project Apache DeltaSpike Sources


[This commit notification would consist of 125 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1737937 - /deltaspike/site/trunk/content/javadoc/1.6.1-SNAPSHOT/

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:16:58 2016
New Revision: 1737937

URL: http://svn.apache.org/viewvc?rev=1737937=rev
Log:
Automatic svn path creation: 
https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/javadoc/1.6.1-SNAPSHOT

Added:
deltaspike/site/trunk/content/javadoc/1.6.1-SNAPSHOT/

svn commit: r1737936 - in /deltaspike/site/trunk/content: download.html examples.html javadoc.html news.html

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:15:39 2016
New Revision: 1737936

URL: http://svn.apache.org/viewvc?rev=1737936=rev
Log:
Site checkin for project Apache DeltaSpike Site

Modified:
deltaspike/site/trunk/content/download.html
deltaspike/site/trunk/content/examples.html
deltaspike/site/trunk/content/javadoc.html
deltaspike/site/trunk/content/news.html

Modified: deltaspike/site/trunk/content/download.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/download.html?rev=1737936=1737935=1737936=diff
==
--- deltaspike/site/trunk/content/download.html (original)
+++ deltaspike/site/trunk/content/download.html Wed Apr  6 08:15:39 2016
@@ -256,7 +256,7 @@ table.CodeRay td.code>pre{padding:0}
 Latest Release
 
 
-v1.5.4
+v1.6.0
 
 
 
@@ -266,28 +266,28 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.5.4/distribution-full-1.5.4.zip;>distribution-full-1.5.4.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.zip;>distribution-full-1.6.0.zip
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/distribution-full-1.5.4.zip.asc;>distribution-full-1.5.4.zip.asc
+http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.asc;>distribution-full-1.6.0.zip.asc
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/distribution-full-1.5.4.zip.md5;>distribution-full-1.5.4.zip.md5
+http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.md5;>distribution-full-1.6.0.zip.md5
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/distribution-full-1.5.4.zip.sha1;>distribution-full-1.5.4.zip.sha1
+http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.zip.sha1;>distribution-full-1.6.0.zip.sha1
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.5.4/distribution-full-1.5.4.tar.gz;>distribution-full-1.5.4.tar.gz
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz;>distribution-full-1.6.0.tar.gz
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/distribution-full-1.5.4.tar.gz.asc;>distribution-full-1.5.4.tar.gz.asc
+http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.asc;>distribution-full-1.6.0.tar.gz.asc
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/distribution-full-1.5.4.tar.gz.md5;>distribution-full-1.5.4.tar.gz.md5
+http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.md5;>distribution-full-1.6.0.tar.gz.md5
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/distribution-full-1.5.4.tar.gz.sha1;>distribution-full-1.5.4.tar.gz.sha1
+http://www.apache.org/dist/deltaspike/1.6.0/distribution-full-1.6.0.tar.gz.sha1;>distribution-full-1.6.0.tar.gz.sha1
 
 
 
@@ -299,16 +299,16 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.5.4/deltaspike-1.5.4-source-release.zip;>deltaspike-1.5.4-source-release.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip;>deltaspike-1.6.0-source-release.zip
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/deltaspike-1.5.4-source-release.zip.asc;>deltaspike-1.5.4-source-release.zip.asc
+http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.asc;>deltaspike-1.6.0-source-release.zip.asc
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/deltaspike-1.5.4-source-release.zip.md5;>deltaspike-1.5.4-source-release.zip.md5
+http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.md5;>deltaspike-1.6.0-source-release.zip.md5
 
 
-http://www.apache.org/dist/deltaspike/1.5.4/deltaspike-1.5.4-source-release.zip.sha1;>deltaspike-1.5.4-source-release.zip.sha1
+http://www.apache.org/dist/deltaspike/1.6.0/deltaspike-1.6.0-source-release.zip.sha1;>deltaspike-1.6.0-source-release.zip.sha1
 
 
 
@@ -351,7 +351,7 @@ the signatures using e.g.:
 
 
 $ pgpk -a KEYS
-$ pgpv deltaspike-project-1.5.4-source-release.zip.asc
+$ pgpv deltaspike-project-1.6.0-source-release.zip.asc
 
 
 
@@ -360,7 +360,7 @@ $ pgpv deltaspike-project-1.5.4-source-r
 
 
 $ pgp -ka KEYS
-$ pgp deltaspike-project-1.5.4-source-release.zip.asc
+$ pgp deltaspike-project-1.6.0-source-release.zip.asc
 
 
 
@@ -369,7 +369,7 @@ $ pgp deltaspike-project-1.5.4-source-re
 
 
 $ gpg --import KEYS
-$ gpg --verify deltaspike-project-1.5.4-source-release.zip.asc
+$ gpg --verify deltaspike-project-1.6.0-source-release.zip.asc
 
 
 

Modified: deltaspike/site/trunk/content/examples.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/examples.html?rev=1737936=1737935=1737936=diff
==
--- deltaspike/site/trunk/content/examples.html (original)
+++ deltaspike/site/trunk/content/examples.html Wed Apr  6 08:15:39 2016
@@ -255,7 +255,7 @@ table.CodeRay td.code>pre{padding:0}
   

svn commit: r1737934 - /deltaspike/site/trunk/content/staging/

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:03:59 2016
New Revision: 1737934

URL: http://svn.apache.org/viewvc?rev=1737934=rev
Log:
Site checkin for project Apache DeltaSpike Site

Modified:
deltaspike/site/trunk/content/staging/addons.html
deltaspike/site/trunk/content/staging/articles.html
deltaspike/site/trunk/content/staging/community.html
deltaspike/site/trunk/content/staging/documentation.html
deltaspike/site/trunk/content/staging/download.html
deltaspike/site/trunk/content/staging/examples.html
deltaspike/site/trunk/content/staging/external.html
deltaspike/site/trunk/content/staging/javadoc.html
deltaspike/site/trunk/content/staging/migration-guide.html
deltaspike/site/trunk/content/staging/news.html
deltaspike/site/trunk/content/staging/release-preparation.html
deltaspike/site/trunk/content/staging/source.html
deltaspike/site/trunk/content/staging/steps_for_a_release.html
deltaspike/site/trunk/content/staging/suggested-git-workflows.html

Modified: deltaspike/site/trunk/content/staging/addons.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/addons.html?rev=1737934=1737933=1737934=diff
==
--- deltaspike/site/trunk/content/staging/addons.html (original)
+++ deltaspike/site/trunk/content/staging/addons.html Wed Apr  6 08:03:59 2016
@@ -301,7 +301,7 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-Copyright  2011-2015 The Apache Software Foundation,
+Copyright  2011-2016 The Apache Software Foundation,
 Licensed under the Apache License, Version 2.0.
 
 Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.

Modified: deltaspike/site/trunk/content/staging/articles.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/articles.html?rev=1737934=1737933=1737934=diff
==
--- deltaspike/site/trunk/content/staging/articles.html (original)
+++ deltaspike/site/trunk/content/staging/articles.html Wed Apr  6 08:03:59 2016
@@ -328,7 +328,7 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-Copyright  2011-2015 The Apache Software Foundation,
+Copyright  2011-2016 The Apache Software Foundation,
 Licensed under the Apache License, Version 2.0.
 
 Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.

Modified: deltaspike/site/trunk/content/staging/community.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/community.html?rev=1737934=1737933=1737934=diff
==
--- deltaspike/site/trunk/content/staging/community.html (original)
+++ deltaspike/site/trunk/content/staging/community.html Wed Apr  6 08:03:59 
2016
@@ -487,7 +487,7 @@ find http://people.apache.org/~
 
 
 
-Copyright  2011-2015 The Apache Software Foundation,
+Copyright  2011-2016 The Apache Software Foundation,
 Licensed under the Apache License, Version 2.0.
 
 Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.

Modified: deltaspike/site/trunk/content/staging/documentation.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation.html?rev=1737934=1737933=1737934=diff
==
--- deltaspike/site/trunk/content/staging/documentation.html (original)
+++ deltaspike/site/trunk/content/staging/documentation.html Wed Apr  6 
08:03:59 2016
@@ -350,7 +350,7 @@ have a look at the 
 
 
-Copyright  2011-2015 The Apache Software Foundation,
+Copyright  2011-2016 The Apache Software Foundation,
 Licensed under the Apache License, Version 2.0.
 
 Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.

Modified: deltaspike/site/trunk/content/staging/download.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/download.html?rev=1737934=1737933=1737934=diff
==
--- deltaspike/site/trunk/content/staging/download.html (original)
+++ deltaspike/site/trunk/content/staging/download.html Wed Apr  6 08:03:59 2016
@@ -256,7 +256,7 @@ table.CodeRay td.code>pre{padding:0}
 Latest Release
 
 
-v1.5.4
+v1.6.0
 
 
 
@@ -266,28 +266,28 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-http://www.apache.org/dyn/closer.cgi/deltaspike/1.5.4/distribution-full-1.5.4.zip;>distribution-full-1.5.4.zip
+http://www.apache.org/dyn/closer.cgi/deltaspike/1.6.0/distribution-full-1.6.0.zip;>distribution-full-1.6.0.zip
 
 
-http://w

svn commit: r1737933 - /deltaspike/site/trunk/content/staging/documentation/

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 08:03:20 2016
New Revision: 1737933

URL: http://svn.apache.org/viewvc?rev=1737933=rev
Log:
Site checkin for project Apache DeltaSpike Documentation

Modified:
deltaspike/site/trunk/content/staging/documentation/bean-validation.html
deltaspike/site/trunk/content/staging/documentation/build.html
deltaspike/site/trunk/content/staging/documentation/cdiimp.html
deltaspike/site/trunk/content/staging/documentation/configuration.html
deltaspike/site/trunk/content/staging/documentation/configure.html
deltaspike/site/trunk/content/staging/documentation/container-control.html
deltaspike/site/trunk/content/staging/documentation/core.html
deltaspike/site/trunk/content/staging/documentation/data.html
deltaspike/site/trunk/content/staging/documentation/index.html
deltaspike/site/trunk/content/staging/documentation/jpa.html
deltaspike/site/trunk/content/staging/documentation/jsf.html
deltaspike/site/trunk/content/staging/documentation/modules.html
deltaspike/site/trunk/content/staging/documentation/overview.html
deltaspike/site/trunk/content/staging/documentation/partial-bean.html
deltaspike/site/trunk/content/staging/documentation/projectstage.html
deltaspike/site/trunk/content/staging/documentation/proxy.html
deltaspike/site/trunk/content/staging/documentation/scheduler.html
deltaspike/site/trunk/content/staging/documentation/security.html
deltaspike/site/trunk/content/staging/documentation/servlet.html
deltaspike/site/trunk/content/staging/documentation/snapshots.html
deltaspike/site/trunk/content/staging/documentation/spi.html
deltaspike/site/trunk/content/staging/documentation/test-control.html

Modified: 
deltaspike/site/trunk/content/staging/documentation/bean-validation.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/bean-validation.html?rev=1737933=1737932=1737933=diff
==
--- deltaspike/site/trunk/content/staging/documentation/bean-validation.html 
(original)
+++ deltaspike/site/trunk/content/staging/documentation/bean-validation.html 
Wed Apr  6 08:03:20 2016
@@ -300,6 +300,14 @@ table.CodeRay td.code>pre{padding:0}
 /dependency
 
 
+
+Or if youre using Gradle, add these dependencies to your 
build.gradle:
+
+
+
+ runtime 
'org.apache.deltaspike.modules:deltaspike-bean-validation-module-impl'
+
+
 
 
 
@@ -390,7 +398,7 @@ simply need to override the factory. The
 
 
 
-Copyright  2011-2015 The Apache Software Foundation,
+Copyright  2011-2016 The Apache Software Foundation,
 Licensed under the Apache License, Version 2.0.
 
 Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.

Modified: deltaspike/site/trunk/content/staging/documentation/build.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/build.html?rev=1737933=1737932=1737933=diff
==
--- deltaspike/site/trunk/content/staging/documentation/build.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/build.html Wed Apr  6 
08:03:20 2016
@@ -277,7 +277,7 @@ table.CodeRay td.code>pre{padding:0}
 The DeltaSpike source (modules and examples) is provided for inspection, 
contribution and testing purposes. The source must be built with Maven, which 
has been used to automate the compilation, testing and packaging processes. 
Arquillian tests are included with the source and a CDI implementation or 
container can be specified with which to carry out the tests.
 
 
-In all cases, to obtain the DeltaSpike source, https://deltaspike.apache.org/download.html;>download 
deltaspike-project-1.5.4-source-release.zip and extract the 
contents.
+In all cases, to obtain the DeltaSpike source, https://deltaspike.apache.org/download.html;>download 
deltaspike-project-1.6.0-source-release.zip and extract the 
contents.
 
 
 
@@ -301,7 +301,7 @@ You can also obtain the DeltaSpike sourc
 
 
 
-$ cd 
/path/to/deltaspike-project-1.5.4/
+$ cd 
/path/to/deltaspike-project-1.6.0/
 $ mvn clean install
 
 
@@ -538,7 +538,7 @@ Set WLS_HOME so that 
 
 
 
-Copyright  2011-2015 The Apache Software Foundation,
+Copyright  2011-2016 The Apache Software Foundation,
 Licensed under the Apache License, Version 2.0.
 
 Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.

Modified: deltaspike/site/trunk/content/staging/documentation/cdiimp.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/cdiimp.html?rev=1737933=1737932=1737933=diff
==
--- deltaspike/site/trunk/content/staging/d

svn commit: r984885 - /websites/production/deltaspike/content/

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 07:17:58 2016
New Revision: 984885

Log:
Publishing svnmucc operation to deltaspike site by gpetracek

Added:
websites/production/deltaspike/content/
  - copied from r984884, websites/staging/deltaspike/trunk/content/

svn commit: r1737927 - /deltaspike/site/trunk/content/index.html

[gpetracek]

Author: gpetracek
Date: Wed Apr  6 07:10:25 2016
New Revision: 1737927

URL: http://svn.apache.org/viewvc?rev=1737927=rev
Log:
updated content

Modified:
deltaspike/site/trunk/content/index.html

Modified: deltaspike/site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/deltaspike/site/trunk/content/index.html?rev=1737927=1737926=1737927=diff
==
--- deltaspike/site/trunk/content/index.html (original)
+++ deltaspike/site/trunk/content/index.html Wed Apr  6 07:10:25 2016
@@ -24,9 +24,8 @@
 
 
 News
-End of Support Announcement - Java 6
-The upcoming DeltaSpike 1.6 will be the last to support 
Java 6.  
-View details »
+Apache DeltaSpike 1.6.0 is now out!
+View details »