cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Minor fixes
Date Wed, 11 Feb 2015 10:43:50 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8e5bae551 -> 40618c9c7


Minor fixes


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

Branch: refs/heads/3.0.x-fixes
Commit: 40618c9c7e6b4314279f6582a73bae7b42657b31
Parents: 8e5bae5
Author: reta <drreta@gmail.com>
Authored: Mon Feb 9 19:01:09 2015 -0500
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Feb 11 10:43:30 2015 +0000

----------------------------------------------------------------------
 .../JaxrsServletContainerInitializer.java       | 22 ++++++++++++--------
 systests/rs-http-sci/pom.xml                    | 13 ++----------
 2 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/40618c9c/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
----------------------------------------------------------------------
diff --git a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index c872926..18473f2 100644
--- a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++ b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -161,11 +161,13 @@ public class JaxrsServletContainerInitializer implements ServletContainerInitial
         grouped.put(Provider.class, new ArrayList< Class< ? > >());
         grouped.put(Path.class, new ArrayList< Class< ? > >());
         
-        for (final Class< ? > clazz: classes) {
-            if (!classShouldBeIgnored(clazz)) {
-                for (final Class< ? extends Annotation > annotation: grouped.keySet())
{
-                    if (clazz.isAnnotationPresent(annotation)) {
-                        grouped.get(annotation).add(clazz);
+        if (classes != null) {
+            for (final Class< ? > clazz: classes) {
+                if (!classShouldBeIgnored(clazz)) {
+                    for (final Class< ? extends Annotation > annotation: grouped.keySet())
{
+                        if (clazz.isAnnotationPresent(annotation)) {
+                            grouped.get(annotation).add(clazz);
+                        }
                     }
                 }
             }
@@ -179,10 +181,12 @@ public class JaxrsServletContainerInitializer implements ServletContainerInitial
     }
 
     private static Class< ? > findCandidate(final Set< Class< ? > > classes)
{
-        for (final Class< ? > clazz: classes) {
-            if (Application.class.isAssignableFrom(clazz) && !classShouldBeIgnored(clazz))
{
-                LOG.fine("Found JAX-RS application to initialize: " + clazz.getName());
-                return clazz;
+        if (classes != null) {
+            for (final Class< ? > clazz: classes) {
+                if (Application.class.isAssignableFrom(clazz) && !classShouldBeIgnored(clazz))
{
+                    LOG.fine("Found JAX-RS application to initialize: " + clazz.getName());
+                    return clazz;
+                }
             }
         }
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/40618c9c/systests/rs-http-sci/pom.xml
----------------------------------------------------------------------
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index 1214d41..b0644bf 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -34,6 +34,7 @@
         <cxf.surefire.fork.vmargs>-XX:MaxPermSize=192m</cxf.surefire.fork.vmargs>
         <cxf.server.launcher.vmargs>-XX:MaxPermSize=192m</cxf.server.launcher.vmargs>
         <cxf.tomcat.version>7.0.52</cxf.tomcat.version>
+        <cxf.jetty.version>9.2.3.v20140905</cxf.jetty.version>
     </properties>
     <dependencies>
         <dependency>
@@ -114,17 +115,7 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${cxf.tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-logging-juli</artifactId>
-            <version>${cxf.tomcat.version}</version>
-        </dependency>        
+        </dependency>              
         <dependency>
             <groupId>com.ning</groupId>
             <artifactId>async-http-client</artifactId>


Mime
View raw message