tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: more specific API for @EnableServices for jaxrs and jaxws since that's most common use cases
Date Thu, 12 Feb 2015 20:48:15 GMT
Repository: tomee
Updated Branches:
  refs/heads/develop c325195e0 -> 8fafb0174


more specific API for @EnableServices for jaxrs and jaxws since that's most common use cases


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

Branch: refs/heads/develop
Commit: 8fafb0174373ba7546997c81309562fe08e0400a
Parents: c325195
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Thu Feb 12 21:48:04 2015 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Thu Feb 12 21:48:04 2015 +0100

----------------------------------------------------------------------
 .../org/apache/openejb/testing/ApplicationComposers.java    | 9 ++++++++-
 .../java/org/apache/openejb/testing/EnableServices.java     | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/8fafb017/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index bb457ab..c2bebfb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -807,7 +807,14 @@ public final class ApplicationComposers {
             || annotation != null || annotationOld != null) {
             try {
                 if (annotation != null) {
-                    initFilteredServiceManager(annotation.value());
+                    final List<String> value = new ArrayList<String>(asList(annotation.value()));
+                    if (annotation.jaxrs()) {
+                        value.add("jaxrs");
+                    }
+                    if (annotation.jaxws()) {
+                        value.add("jaxws");
+                    }
+                    initFilteredServiceManager(value.toArray(new String[value.size()]));
                 }
                 if (annotationOld != null) {
                     initFilteredServiceManager(annotationOld.value());

http://git-wip-us.apache.org/repos/asf/tomee/blob/8fafb017/container/openejb-core/src/main/java/org/apache/openejb/testing/EnableServices.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/EnableServices.java
b/container/openejb-core/src/main/java/org/apache/openejb/testing/EnableServices.java
index 1d91d1b..c056ef5 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/EnableServices.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/EnableServices.java
@@ -29,5 +29,7 @@ public @interface EnableServices {
     // default is empty list which means that all services gonna be activated
     String[] value() default {};
 
+    boolean jaxrs() default false;
+    boolean jaxws() default false;
     boolean httpDebug() default false;
 }


Mime
View raw message