renamed service xml elements and attributes as per review KNOX-483
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/12b28045 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/12b28045 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/12b28045 Branch: refs/heads/KNOX-481 Commit: 12b28045e50a727a6c20949be532054dce5dead6 Parents: c588ab7 Author: Sumit Gupta <su...@apache.org> Authored: Wed Jan 21 15:52:15 2015 -0500 Committer: Sumit Gupta <su...@apache.org> Committed: Wed Feb 11 15:17:28 2015 -0500 ---------------------------------------------------------------------- .../service/definition/PolicyBinding.java | 45 ------------ .../service/definition/RewriteFilter.java | 47 ------------- .../service/definition/ServiceDefinition.java | 23 ------ .../gateway/service/definition/UrlBinding.java | 73 -------------------- 4 files changed, 188 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/12b28045/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/PolicyBinding.java ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/PolicyBinding.java b/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/PolicyBinding.java deleted file mode 100644 index d87674f..0000000 --- a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/PolicyBinding.java +++ /dev/null @@ -1,45 +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.hadoop.gateway.service.definition; - -import javax.xml.bind.annotation.XmlAttribute; - -public class PolicyBinding { - - private String name; - - private String role; - - @XmlAttribute - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @XmlAttribute - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } -} http://git-wip-us.apache.org/repos/asf/knox/blob/12b28045/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/RewriteFilter.java ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/RewriteFilter.java b/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/RewriteFilter.java deleted file mode 100644 index 4b0dccc..0000000 --- a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/RewriteFilter.java +++ /dev/null @@ -1,47 +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.hadoop.gateway.service.definition; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -@XmlType(name = "rewrite-filter") -public class RewriteFilter { - - private String ref; - - private String applyTo; - - @XmlAttribute - public String getRef() { - return ref; - } - - public void setRef(String ref) { - this.ref = ref; - } - - @XmlAttribute(name = "apply-to") - public String getApplyTo() { - return applyTo; - } - - public void setApplyTo(String applyTo) { - this.applyTo = applyTo; - } -} http://git-wip-us.apache.org/repos/asf/knox/blob/12b28045/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/ServiceDefinition.java ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/ServiceDefinition.java b/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/ServiceDefinition.java index 6cb14c4..cbb9309 100644 --- a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/ServiceDefinition.java +++ b/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/ServiceDefinition.java @@ -38,10 +38,6 @@ public class ServiceDefinition { private CustomDispatch dispatch; - private List<PolicyBinding> policyBindings; - - private CustomDispatch dispatch; - @XmlAttribute public String getName() { return name; @@ -97,23 +93,4 @@ public class ServiceDefinition { public void setDispatch(CustomDispatch dispatch) { this.dispatch = dispatch; } - - @XmlElement(name = "policy") - @XmlElementWrapper(name = "policies") - public List<PolicyBinding> getPolicyBindings() { - return policyBindings; - } - - public void setPolicyBindings(List<PolicyBinding> policyBindings) { - this.policyBindings = policyBindings; - } - - @XmlElement(name = "dispatch") - public CustomDispatch getDispatch() { - return dispatch; - } - - public void setDispatch(CustomDispatch dispatch) { - this.dispatch = dispatch; - } } http://git-wip-us.apache.org/repos/asf/knox/blob/12b28045/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/UrlBinding.java ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/UrlBinding.java b/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/UrlBinding.java deleted file mode 100644 index a1b7718..0000000 --- a/gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/UrlBinding.java +++ /dev/null @@ -1,73 +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.hadoop.gateway.service.definition; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; -import java.util.List; - -@XmlType(name = "url") -public class UrlBinding { - - private String pattern; - - private List<RewriteFilter> rewriteFilters; - - private List<PolicyBinding> policyBindings; - - private CustomDispatch dispatch; - - @XmlAttribute - public String getPattern() { - return pattern; - } - - public void setPattern(String pattern) { - this.pattern = pattern; - } - - @XmlElement(name = "rewrite-filter") - public List<RewriteFilter> getRewriteFilters() { - return rewriteFilters; - } - - public void setRewriteFilters(List<RewriteFilter> rewriteFilters) { - this.rewriteFilters = rewriteFilters; - } - - @XmlElement(name = "policy") - @XmlElementWrapper(name = "policies") - public List<PolicyBinding> getPolicyBindings() { - return policyBindings; - } - - public void setPolicyBindings(List<PolicyBinding> policyBindings) { - this.policyBindings = policyBindings; - } - - @XmlElement(name = "dispatch") - public CustomDispatch getDispatch() { - return dispatch; - } - - public void setDispatch(CustomDispatch dispatch) { - this.dispatch = dispatch; - } -}
