You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/06/08 01:48:25 UTC
[15/22] cxf git commit: Renamed misspelled CxfUndertwoServlet to
CxfUndertowServlet
Renamed misspelled CxfUndertwoServlet to CxfUndertowServlet
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1c3085ea
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1c3085ea
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1c3085ea
Branch: refs/heads/master-jaxrs-2.1
Commit: 1c3085ea94a902e6bf4a49b50c121e778efd28c2
Parents: a28ea6b
Author: reta <dr...@gmail.com>
Authored: Tue Jun 7 21:46:11 2016 -0400
Committer: reta <dr...@gmail.com>
Committed: Tue Jun 7 21:46:11 2016 -0400
----------------------------------------------------------------------
.../http_undertow/CxfUndertowServlet.java | 58 ++++++++++++++++++++
.../http_undertow/CxfUndertwoServlet.java | 58 --------------------
.../http_undertow/UndertowHTTPServerEngine.java | 2 +-
3 files changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1c3085ea/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertowServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertowServlet.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertowServlet.java
new file mode 100644
index 0000000..85a10c7
--- /dev/null
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertowServlet.java
@@ -0,0 +1,58 @@
+/**
+ * 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.cxf.transport.http_undertow;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
+
+public class CxfUndertowServlet extends AbstractHTTPServlet {
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+
+ }
+
+ @Override
+ protected Bus getBus() {
+ return null;
+ }
+
+ @Override
+ protected void invoke(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ UndertowHTTPDestination undertowHTTPDestination =
+ (UndertowHTTPDestination)request.getAttribute("UNDERTOW_DESTINATION");
+ try {
+ undertowHTTPDestination.doService(request.getServletContext(), request, response);
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new ServletException(e);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1c3085ea/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertwoServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertwoServlet.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertwoServlet.java
deleted file mode 100644
index efb60d7..0000000
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/CxfUndertwoServlet.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * 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.cxf.transport.http_undertow;
-
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
-
-public class CxfUndertwoServlet extends AbstractHTTPServlet {
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException {
-
- }
-
- @Override
- protected Bus getBus() {
- return null;
- }
-
- @Override
- protected void invoke(HttpServletRequest request, HttpServletResponse response) throws ServletException {
- UndertowHTTPDestination undertowHTTPDestination =
- (UndertowHTTPDestination)request.getAttribute("UNDERTOW_DESTINATION");
- try {
- undertowHTTPDestination.doService(request.getServletContext(), request, response);
- } catch (IOException e) {
- e.printStackTrace();
- throw new ServletException(e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1c3085ea/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
index b6c772d..7cfed67 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
@@ -186,7 +186,7 @@ public class UndertowHTTPServerEngine implements ServerEngine {
deploymentInfo.setClassLoader(Thread.currentThread().getContextClassLoader());
deploymentInfo.setDeploymentName("cxf-undertow");
deploymentInfo.setContextPath(contextName);
- ServletInfo asyncServlet = new ServletInfo(ServletPathMatches.DEFAULT_SERVLET_NAME, CxfUndertwoServlet.class);
+ ServletInfo asyncServlet = new ServletInfo(ServletPathMatches.DEFAULT_SERVLET_NAME, CxfUndertowServlet.class);
deploymentInfo.addServlet(asyncServlet);
servletContainer.addDeployment(deploymentInfo);
DeploymentManager deploymentManager = servletContainer.getDeployment(deploymentInfo.getDeploymentName());