Merge pull request #49 from impetus-opensource/JUM-80

Fixed bug JUM-80: Need to refactor some classes related to validations t...
Impetus · Feb 16, 2015 · 26dea71 · 26dea71
2 parents 5ce5898 + 5be6722
commit 26dea71
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 26 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -39,7 +39,7 @@
 						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
 							<excludes>
-								<exclude>org/jumbune/common/utils/yarn/**/*</exclude>
+								<exclude>org/jumbune/common/yarn/utils/**/*</exclude>
 							</excludes>
 						</configuration>
 					</plugin>

diff --git a/common/src/main/java/org/jumbune/common/utils/HadoopLogParser.java b/common/src/main/java/org/jumbune/common/utils/HadoopLogParser.java
@@ -86,7 +86,7 @@ public class HadoopLogParser {
 	/** The Constant RUMEN_MAIN_CLASS_OLD. */
 	private static final String RUMEN_MAIN_CLASS_OLD = "org.jumbune.org.apache.hadoop.tools.rumen.TraceBuilder";
 
-	private static final String YARN_JOB_STATS_UTILITY_CLASS = "org.jumbune.common.utils.yarn.YarnJobStatsUtility";
+	private static final String YARN_JOB_STATS_UTILITY_CLASS = "org.jumbune.common.yarn.utils.YarnJobStatsUtility";
 
 	private static final String YARN_JOB_STATS_UTILITY_CLASS_PARSE_METHOD = "parseAndGetJobStats";	
 

diff --git a/...utils/yarn/DecoratedJobHistoryParser.java → ...yarn/utils/DecoratedJobHistoryParser.java b/...utils/yarn/DecoratedJobHistoryParser.java → ...yarn/utils/DecoratedJobHistoryParser.java
@@ -1,4 +1,4 @@
-package org.jumbune.common.utils.yarn;
+package org.jumbune.common.yarn.utils;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...ommon/utils/yarn/YarnJobStatsUtility.java → ...ommon/yarn/utils/YarnJobStatsUtility.java b/...ommon/utils/yarn/YarnJobStatsUtility.java → ...ommon/yarn/utils/YarnJobStatsUtility.java
@@ -1,4 +1,4 @@
-package org.jumbune.common.utils.yarn;
+package org.jumbune.common.yarn.utils;
 
 
 
@@ -30,8 +30,8 @@
 import org.jumbune.common.beans.ResourceUsageMetrics;
 import org.jumbune.common.beans.TaskOutputDetails;
 import org.jumbune.common.utils.Constants;
-import org.jumbune.common.utils.yarn.DecoratedJobHistoryParser.AdditionalJobInfo;
-import org.jumbune.common.utils.yarn.DecoratedJobHistoryParser.AdditionalTaskInfo;
+import org.jumbune.common.yarn.utils.DecoratedJobHistoryParser.AdditionalJobInfo;
+import org.jumbune.common.yarn.utils.DecoratedJobHistoryParser.AdditionalTaskInfo;
 
 
 /**

diff --git a/utilities/pom.xml b/utilities/pom.xml
@@ -37,7 +37,7 @@
 		<artifactId>maven-compiler-plugin</artifactId>
 		<configuration>
 			 <excludes>
-			    <exclude>org/jumbune/utils/yarn/**/*</exclude>
+			    <exclude>org/jumbune/yarn/utils/**/*</exclude>
 			  </excludes>
 		</configuration>
 		</plugin>

diff --git a/.../utils/yarn/ApplicationHistoryClient.java → .../yarn/utils/ApplicationHistoryClient.java b/.../utils/yarn/ApplicationHistoryClient.java → .../yarn/utils/ApplicationHistoryClient.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...e/utils/yarn/ApplicationMasterClient.java → ...e/yarn/utils/ApplicationMasterClient.java b/...e/utils/yarn/ApplicationMasterClient.java → ...e/yarn/utils/ApplicationMasterClient.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...utils/yarn/ApplicationMasterContract.java → ...yarn/utils/ApplicationMasterContract.java b/...utils/yarn/ApplicationMasterContract.java → ...yarn/utils/ApplicationMasterContract.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.util.Collection;

diff --git a/...org/jumbune/utils/yarn/ClientRMProxy.java → ...org/jumbune/yarn/utils/ClientRMProxy.java b/...org/jumbune/utils/yarn/ClientRMProxy.java → ...org/jumbune/yarn/utils/ClientRMProxy.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...arn/ContainerManagementProtocolProxy.java → ...ils/ContainerManagementProtocolProxy.java b/...arn/ContainerManagementProtocolProxy.java → ...ils/ContainerManagementProtocolProxy.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.net.InetSocketAddress;
 import java.security.PrivilegedAction;

diff --git a/.../jumbune/utils/yarn/ContainerRequest.java → .../jumbune/yarn/utils/ContainerRequest.java b/.../jumbune/utils/yarn/ContainerRequest.java → .../jumbune/yarn/utils/ContainerRequest.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...java/org/jumbune/utils/yarn/NMClient.java → ...java/org/jumbune/yarn/utils/NMClient.java b/...java/org/jumbune/utils/yarn/NMClient.java → ...java/org/jumbune/yarn/utils/NMClient.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -30,7 +30,7 @@
 import org.apache.hadoop.yarn.ipc.RPCUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jumbune.utils.yarn.ContainerManagementProtocolProxy.ContainerManagementProtocolProxyData;
+import org.jumbune.yarn.utils.ContainerManagementProtocolProxy.ContainerManagementProtocolProxyData;
 
 public class NMClient extends AbstractService{
 

diff --git a/.../org/jumbune/utils/yarn/NMTokenCache.java → .../org/jumbune/yarn/utils/NMTokenCache.java b/.../org/jumbune/utils/yarn/NMTokenCache.java → .../org/jumbune/yarn/utils/NMTokenCache.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.util.concurrent.ConcurrentHashMap;
 

diff --git a/...e/utils/yarn/RMFailoverProxyProvider.java → ...e/yarn/utils/RMFailoverProxyProvider.java b/...e/utils/yarn/RMFailoverProxyProvider.java → ...e/yarn/utils/RMFailoverProxyProvider.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.retry.FailoverProxyProvider;

diff --git a/.../java/org/jumbune/utils/yarn/RMProxy.java → .../java/org/jumbune/yarn/utils/RMProxy.java b/.../java/org/jumbune/utils/yarn/RMProxy.java → .../java/org/jumbune/yarn/utils/RMProxy.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.net.ConnectException;

diff --git a/.../org/jumbune/utils/yarn/RackResolver.java → .../org/jumbune/yarn/utils/RackResolver.java b/.../org/jumbune/utils/yarn/RackResolver.java → .../org/jumbune/yarn/utils/RackResolver.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...va/org/jumbune/utils/yarn/YarnClient.java → ...va/org/jumbune/yarn/utils/YarnClient.java b/...va/org/jumbune/utils/yarn/YarnClient.java → ...va/org/jumbune/yarn/utils/YarnClient.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...une/utils/yarn/YarnClientApplication.java → ...une/yarn/utils/YarnClientApplication.java b/...une/utils/yarn/YarnClientApplication.java → ...une/yarn/utils/YarnClientApplication.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;

diff --git a/...ls/yarn/YarnExecutionCommandsBuilder.java → ...n/utils/YarnExecutionCommandsBuilder.java b/...ls/yarn/YarnExecutionCommandsBuilder.java → ...n/utils/YarnExecutionCommandsBuilder.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 public class YarnExecutionCommandsBuilder {
 

diff --git a/...rg/jumbune/utils/yarn/YarnOperations.java → ...rg/jumbune/yarn/utils/YarnOperations.java b/...rg/jumbune/utils/yarn/YarnOperations.java → ...rg/jumbune/yarn/utils/YarnOperations.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/.../java/org/jumbune/utils/yarn/YarnRPC.java → .../java/org/jumbune/yarn/utils/YarnRPC.java b/.../java/org/jumbune/utils/yarn/YarnRPC.java → .../java/org/jumbune/yarn/utils/YarnRPC.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn;
+package org.jumbune.yarn.utils;
 
 import java.net.InetSocketAddress;
 

diff --git a/.../utils/yarn/client/ApplicationMaster.java → .../yarn/utils/client/ApplicationMaster.java b/.../utils/yarn/client/ApplicationMaster.java → .../yarn/utils/client/ApplicationMaster.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn.client;
+package org.jumbune.yarn.utils.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...tils/yarn/client/YarnClientDecorator.java → ...arn/utils/client/YarnClientDecorator.java b/...tils/yarn/client/YarnClientDecorator.java → ...arn/utils/client/YarnClientDecorator.java
@@ -1,4 +1,4 @@
-package org.jumbune.utils.yarn.client;
+package org.jumbune.yarn.utils.client;
 
 import java.io.File;
 import java.io.IOException;