cxf git commit: CXF-6132: Provide JAX-RS ServletContextInitializer. Initial implementation

2015-02-11 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a94b303ed -> 3832db055


CXF-6132: Provide JAX-RS ServletContextInitializer. Initial implementation


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

Branch: refs/heads/3.0.x-fixes
Commit: 3832db055cbc8b7341bdb6fe4ba8ef5efb6be105
Parents: a94b303
Author: reta 
Authored: Mon Jan 26 20:58:01 2015 -0500
Committer: Sergey Beryozkin 
Committed: Wed Feb 11 10:24:26 2015 +

--
 .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java |  2 +-
 rt/pom.xml  |  1 +
 .../javax.servlet.ServletContainerInitializer   |  1 +
 rt/rs/http-sci/pom.xml  | 59 +
 .../JaxrsServletContainerInitializer.java   | 89 
 5 files changed, 151 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index db9ff27..8329de5 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -514,7 +514,7 @@ public class CXFNonSpringJaxrsServlet extends 
CXFNonSpringServlet {
 
 protected boolean isIgnoreApplicationPath(ServletConfig servletConfig) {
 String ignoreParam = 
servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM);
-return ignoreParam == null || MessageUtils.isTrue(ignoreParam);
+return ignoreParam != null && MessageUtils.isTrue(ignoreParam);
 }
 
 protected void createServerFromApplication(ServletConfig servletConfig) 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/pom.xml
--
diff --git a/rt/pom.xml b/rt/pom.xml
index 11c71c5..d25cb57 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -58,6 +58,7 @@
 ws/mex
 ws/eventing
 rs/client
+rs/http-sci
 rs/description
 rs/extensions/providers
 rs/extensions/search

http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
--
diff --git 
a/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
 
b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
new file mode 100644
index 000..3d22cbc
--- /dev/null
+++ 
b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
@@ -0,0 +1 @@
+org.apache.cxf.jaxrs.servlet.JaxrsServletContainerInitializer
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/rs/http-sci/pom.xml
--
diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml
new file mode 100644
index 000..9886ed4
--- /dev/null
+++ b/rt/rs/http-sci/pom.xml
@@ -0,0 +1,59 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+cxf-rt-rs-http-sci
+bundle
+Apache CXF JAX-RS Service Description
+Apache CXF JAX-RS Service Description
+http://cxf.apache.org
+
+org.apache.cxf
+cxf-parent
+3.1.0-SNAPSHOT
+../../../parent/pom.xml
+
+
+
+javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+
+
+
+
+org.apache.cxf
+cxf-rt-frontend-jaxrs
+${project.version}
+
+
+junit
+junit
+test
+
+
+${cxf.servlet-api.group}
+${cxf.servlet-api.artifact}
+provided
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/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

cxf git commit: CXF-6132: Provide JAX-RS ServletContextInitializer. Initial implementation

2015-01-26 Thread reta 
Repository: cxf
Updated Branches:
  refs/heads/master fe611ce66 -> e8b8e2bc1


CXF-6132: Provide JAX-RS ServletContextInitializer. Initial implementation


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

Branch: refs/heads/master
Commit: e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64
Parents: fe611ce
Author: reta 
Authored: Mon Jan 26 20:58:01 2015 -0500
Committer: reta 
Committed: Mon Jan 26 20:58:01 2015 -0500

--
 .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java |  2 +-
 rt/pom.xml  |  1 +
 .../javax.servlet.ServletContainerInitializer   |  1 +
 rt/rs/http-sci/pom.xml  | 59 +
 .../JaxrsServletContainerInitializer.java   | 89 
 5 files changed, 151 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e8b8e2bc/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index b9b556d..c3553fd 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -517,7 +517,7 @@ public class CXFNonSpringJaxrsServlet extends 
CXFNonSpringServlet {
 
 protected boolean isIgnoreApplicationPath(ServletConfig servletConfig) {
 String ignoreParam = 
servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM);
-return ignoreParam == null || MessageUtils.isTrue(ignoreParam);
+return ignoreParam != null && MessageUtils.isTrue(ignoreParam);
 }
 
 protected void createServerFromApplication(ServletConfig servletConfig) 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8b8e2bc/rt/pom.xml
--
diff --git a/rt/pom.xml b/rt/pom.xml
index 06f725b..fe8981f 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -58,6 +58,7 @@
 ws/mex
 ws/eventing
 rs/client
+rs/http-sci
 rs/description
 rs/extensions/providers
 rs/extensions/search

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8b8e2bc/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
--
diff --git 
a/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
 
b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
new file mode 100644
index 000..3d22cbc
--- /dev/null
+++ 
b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
@@ -0,0 +1 @@
+org.apache.cxf.jaxrs.servlet.JaxrsServletContainerInitializer
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8b8e2bc/rt/rs/http-sci/pom.xml
--
diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml
new file mode 100644
index 000..9886ed4
--- /dev/null
+++ b/rt/rs/http-sci/pom.xml
@@ -0,0 +1,59 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+cxf-rt-rs-http-sci
+bundle
+Apache CXF JAX-RS Service Description
+Apache CXF JAX-RS Service Description
+http://cxf.apache.org
+
+org.apache.cxf
+cxf-parent
+3.1.0-SNAPSHOT
+../../../parent/pom.xml
+
+
+
+javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+
+
+
+
+org.apache.cxf
+cxf-rt-frontend-jaxrs
+${project.version}
+
+
+junit
+junit
+test
+
+
+${cxf.servlet-api.group}
+${cxf.servlet-api.artifact}
+provided
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8b8e2bc/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/