You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by su...@apache.org on 2015/01/27 17:26:35 UTC
[09/14] knox git commit: KNOX-483 added oozie service xml
KNOX-483 added oozie service xml
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/2c4ba015
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/2c4ba015
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/2c4ba015
Branch: refs/heads/KNOX-481
Commit: 2c4ba01536aaf76aff36be59e1bd615ce96af611
Parents: cb88722
Author: Sumit Gupta <su...@apache.org>
Authored: Tue Jan 6 16:18:15 2015 -0500
Committer: Sumit Gupta <su...@apache.org>
Committed: Tue Jan 27 11:25:20 2015 -0500
----------------------------------------------------------------------
.../ServiceDefinitionDeploymentContributor.java | 1 -
.../resources/services/oozie/4.0.0/rewrite.xml | 122 +++++++++++++++++++
.../resources/services/oozie/4.0.0/service.xml | 30 +++++
.../oozie/OozieDeploymentContributor.java | 10 +-
4 files changed, 158 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/2c4ba015/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java
index dd2a4c9..4cff585 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java
@@ -56,7 +56,6 @@ public class ServiceDefinitionDeploymentContributor extends ServiceDeploymentCon
@Override
public void contributeService(DeploymentContext context, Service service) throws Exception {
- System.out.println("contributing service def");
contributeRewriteRules(context, service);
contributeResources(context, service);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/2c4ba015/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/rewrite.xml
new file mode 100644
index 0000000..d3c52bb
--- /dev/null
+++ b/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/rewrite.xml
@@ -0,0 +1,122 @@
+<!--
+ 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.
+-->
+<rules>
+
+ <rule dir="IN" name="OOZIE/oozie/root" pattern="*://*:*/**/oozie/{**}?{**}">
+ <rewrite template="{$serviceUrl[OOZIE]}/{**}?{**}"/>
+ </rule>
+
+ <rule dir="IN" name="OOZIE/oozie/v1" pattern="*://*:*/**/oozie/v1/{**}?{**}">
+ <rewrite template="{$serviceUrl[OOZIE]}/v1/{**}?{**}"/>
+ </rule>
+
+ <rule dir="IN" name="OOZIE/oozie/v2" pattern="*://*:*/**/oozie/v2/{**}?{**}">
+ <rewrite template="{$serviceUrl[OOZIE]}/v2/{**}?{**}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/user-name">
+ <rewrite template="{$username}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/name-node-url">
+ <rewrite template="hdfs://{$serviceMappedAddr[NAMENODE]}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/job-tracker-address">
+ <rewrite template="{$serviceMappedAddr[JOBTRACKER]}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/hdfs-path" flow="OR">
+ <match pattern="/~">
+ <rewrite template="hdfs://{$serviceMappedHost[NAMENODE]}:{$servicePort[NAMENODE]}/user/{$username}"/>
+ </match>
+ <match pattern="/~/{path=**}">
+ <rewrite template="hdfs://{$serviceMappedHost[NAMENODE]}:{$servicePort[NAMENODE]}/user/{$username}/{path=**}"/>
+ </match>
+ <match pattern="{path=**}">
+ <rewrite template="hdfs://{$serviceMappedHost[NAMENODE]}:{$servicePort[NAMENODE]}/{path=**}"/>
+ </match>
+ </rule>
+
+ <filter name="OOZIE/oozie/configuration">
+ <content type="*/xml">
+ <buffer path="/configuration/property">
+ <detect path="name" value="user.name">
+ <apply path="value" rule="OOZIE/oozie/user-name"/>
+ </detect>
+ <detect path="name" value="nameNode">
+ <apply path="value" rule="OOZIE/oozie/name-node-url"/>
+ </detect>
+ <detect path="name" value="jobTracker">
+ <apply path="value" rule="OOZIE/oozie/job-tracker-address"/>
+ </detect>
+ <detect path="name" value="fs.default.name">
+ <apply path="value" rule="OOZIE/oozie/name-node-url"/>
+ </detect>
+ <detect path="name" value="fs.defaultFS">
+ <apply path="value" rule="OOZIE/oozie/name-node-url"/>
+ </detect>
+ <detect path="name" value="oozie.wf.application.path">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="oozie.coord.application.path">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="oozie.bundle.application.path">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="oozie.libpath">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="mapreduce.job.user.name">
+ <apply path="value" rule="OOZIE/oozie/user-name"/>
+ </detect>
+ <detect path="name" value="mapred.job.tracker">
+ <apply path="value" rule="OOZIE/oozie/job-tracker-address"/>
+ </detect>
+ <detect path="name" value="mapred.input.dir">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="inputDir">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="mapred.output.dir">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ <detect path="name" value="outputDir">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ </buffer>
+ </content>
+ <content type="*/json">
+ <apply path="$[user.name]" rule="OOZIE/oozie/user-name"/>
+ <apply path="$[nameNode]" rule="OOZIE/oozie/name-node-url"/>
+ <apply path="$[jobTracker]" rule="OOZIE/oozie/job-tracker-addr"/>
+ <apply path="$[fs.default.name]" rule="OOZIE/oozie/name-node-url"/>
+ <apply path="$[fs.defaultFS]" rule="OOZIE/oozie/name-node-url"/>
+ <apply path="$[oozie.wf.application.path]" rule="OOZIE/oozie/hdfs-path"/>
+ <apply path="$[oozie.coord.application.path]" rule="OOZIE/oozie/hdfs-path"/>
+ <apply path="$[oozie.bundle.application.path]" rule="OOZIE/oozie/hdfs-path"/>
+ <apply path="$[oozie.libpath]" rule="OOZIE/oozie/hdfs-path"/>
+ <apply path="$[mapreduce.job.user.name]" rule="OOZIE/oozie/user-name"/>
+ <apply path="$[mapred.job.tracker]" rule="OOZIE/oozie/job-tracker-address"/>
+ <apply path="$[mapred.input.dir]" rule="OOZIE/oozie/hdfs-path"/>
+ <apply path="$[mapred.output.dir]" rule="OOZIE/oozie/hdfs-path"/>
+ </content>
+ </filter>
+
+</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/2c4ba015/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/service.xml b/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/service.xml
new file mode 100644
index 0000000..b9c974e
--- /dev/null
+++ b/gateway-service-definitions/src/main/resources/services/oozie/4.0.0/service.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+<service role="OOZIE" name="oozie" version="4.0.0">
+ <urls>
+ <url pattern="/oozie/**?**">
+ <rewrite-filter ref="OOZIE/oozie/configuration" apply-to="request.body"/>
+ </url>
+ <url pattern="/oozie/v1/**?**">
+ <rewrite-filter ref="OOZIE/oozie/configuration" apply-to="request.body"/>
+ </url>
+ <url pattern="/oozie/v2/**?**">
+ <rewrite-filter ref="OOZIE/oozie/configuration" apply-to="request.body"/>
+ </url>
+ </urls>
+</service>
http://git-wip-us.apache.org/repos/asf/knox/blob/2c4ba015/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java b/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
index 63f3c70..4074209 100644
--- a/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
+++ b/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
@@ -45,18 +45,19 @@ public class OozieDeploymentContributor extends ServiceDeploymentContributorBase
@Override
public String getRole() {
- return "OOZIE";
+ return "xOOZIE";
}
@Override
public String getName() {
- return "oozie";
+ return "xoozie";
}
@Override
public void contributeService( DeploymentContext context, Service service ) throws Exception {
- contributeRewriteRules( context, service );
- contributeResources( context, service );
+ //TODO: [sumit] remove once stacks is done KNOX-483
+// contributeRewriteRules( context, service );
+// contributeResources( context, service );
}
private void contributeRewriteRules( DeploymentContext context, Service service ) throws URISyntaxException, IOException {
@@ -106,6 +107,7 @@ public class OozieDeploymentContributor extends ServiceDeploymentContributorBase
private void addDispatchFilter(DeploymentContext context, Service service,
ResourceDescriptor resource) {
+ //TODO: [sumit] set the filter params for dispatch in stacks
List<FilterParamDescriptor> filterParams = new ArrayList<FilterParamDescriptor>();
FilterParamDescriptor filterParamDescriptor = resource.createFilterParam();
filterParamDescriptor.name(REPLAY_BUFFER_SIZE_PARAM);