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/02/18 05:29:33 UTC

[48/50] [abbrv] knox git commit: Combined commits done for KNOX-481, KNOX-483, KNOX-487

Combined commits done for KNOX-481, KNOX-483, KNOX-487


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

Branch: refs/heads/KNOX-481
Commit: 6866353b851763794a1b7abce81f897e55b1dab7
Parents: e24c6d8
Author: Sumit Gupta <su...@apache.org>
Authored: Tue Jan 6 12:07:29 2015 -0500
Committer: Sumit Gupta <su...@apache.org>
Committed: Tue Feb 17 23:19:37 2015 -0500

----------------------------------------------------------------------
 .../gateway/config/impl/GatewayConfigImpl.java  | 22 +------------------
 .../service/definition/ServiceDefinition.java   | 23 --------------------
 .../deploy/DeploymentFactoryFuncTest.java       |  3 +--
 3 files changed, 2 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/6866353b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
index ce27cbc..09b9040 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
@@ -179,27 +179,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
   public String getGatewayStacksDir() {
     return getGatewayDataDir() + File.separator + STACKS_SERVICES_DIRECTORY;
   }
-  
-  @Override
-  public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks" );
-  }
-
-  @Override
-  public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks" );
-  }
-
-  @Override
-  public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks" );
-  }
-
-  @Override
-  public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks" );
-  }
-
+ 
   @Override
   public String getHadoopConfDir() {
     return get( HADOOP_CONF_DIR );

http://git-wip-us.apache.org/repos/asf/knox/blob/6866353b/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/6866353b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
index f7616f6..8b54f6f 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.gateway.topology.Service;
 import org.apache.hadoop.gateway.topology.Topology;
 import org.apache.hadoop.test.log.NoOpAppender;
 import org.apache.log4j.Appender;
-import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -505,7 +504,7 @@ public class DeploymentFactoryFuncTest {
 
     WebArchive war = DeploymentFactory.createDeployment( config, topology );
     Document doc = parse( war.get( "WEB-INF/gateway.xml" ).getAsset().openStream() );
-    //dump( doc );
+    dump( doc );
 
     Node resourceNode, filterNode, paramNode;
     String value;