Repository: incubator-hawq Updated Branches: refs/heads/master af656af59 -> 1e5e996ec
Removed references to tcServer Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/9ccac44a Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/9ccac44a Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/9ccac44a Branch: refs/heads/master Commit: 9ccac44a293da650bb5610fa0895b7dc5b35e944 Parents: d3f4826 Author: Shivram Mani <[email protected]> Authored: Tue Nov 1 13:49:21 2016 -0700 Committer: Shivram Mani <[email protected]> Committed: Tue Nov 1 13:49:21 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hawq/pxf/service/rest/ClusterNodesResource.java | 2 +- .../apache/hawq/pxf/service/utilities/CustomWebappLoader.java | 2 +- pxf/pxf-service/src/main/webapp/WEB-INF/web.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9ccac44a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/ClusterNodesResource.java ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/ClusterNodesResource.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/ClusterNodesResource.java index 1280c09..925155d 100644 --- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/ClusterNodesResource.java +++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/ClusterNodesResource.java @@ -39,7 +39,7 @@ import javax.ws.rs.core.Response; * Class enhances the API of the HBASE rest server. * Example for querying API getClusterNodesInfo from a web client * <code>curl "http://localhost:51200/pxf/{version}/HadoopCluster/getNodesInfo";</code> - * /pxf/ is made part of the path when there is a webapp by that name in tcServer. + * /pxf/ is made part of the path when there is a webapp by that name in webapp container. */ @Path("/" + Version.PXF_PROTOCOL_VERSION + "/HadoopCluster/") public class ClusterNodesResource { http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9ccac44a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/CustomWebappLoader.java ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/CustomWebappLoader.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/CustomWebappLoader.java index 821f2d5..7f45bf7 100644 --- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/CustomWebappLoader.java +++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/CustomWebappLoader.java @@ -49,7 +49,7 @@ import org.apache.juli.logging.LogFactory; public class CustomWebappLoader extends WebappLoader { /** - * Because this class belongs in tcServer itself, logs go into tcServer's log facility that is separate + * Because this class belongs in application container itself, logs go into tomcat's log facility that is separate * from the web app's log facility. * * Logs are directed to catalina.log file. By default only INFO or higher messages are logged. http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9ccac44a/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml b/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml index 395f99b..4ba6629 100644 --- a/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml +++ b/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml @@ -26,14 +26,14 @@ under the License. <!-- This is the PXF webapp xml descriptor - used by tcServer to load the webapp + used by tomcat to load the webapp servlet-class Jersey entrypoint class init-param com.sun.jersey.config.property.packages Tells Jersey where are the REST components of this webapp jersey.config.server.provider.scanning.recursive Tells Jersey to recusively scan package for REST resources - load-on-startup Initialize the webapp on tcServer startup + load-on-startup Initialize the webapp on tomcat startup servlet-mapping Maps the path of the servlet (pxf/*) listener A class called after the webapp was initialized and before it's about to go down
