#4 Gitコマンド実行時の引数を修正

コンポーネント名とGitHubなどのリポジトリ名が異なる場合に、リポジトリ名からGitコマンド実行ディレクトリパスを作成していた。
そのため、ローカルディレクトリパスが正しく取得できていなかった。
ローカルディレクトリパスはコンポーネント名から作成するように修正。

airgraph/src/main/java/com/sec/airgraph/controller/MainController.java

@@ -584,7 +584,7 @@ public String commitComponent(@RequestParam(value = "workPackageName") String wo
 			@RequestParam(value = "commitMessage") String commitMessage) {
 		logger.info("Commit Component to Local Repository. component[" + componentName + "]git[" + gitName
 				+ "]workspace[" + workPackageName + "]commitMessage[" + commitMessage + "]");
-		return mainService.commitComponent(StringUtil.getPackageNameFromModelName(workPackageName), gitName, commitMessage);
+		return mainService.commitComponent(StringUtil.getPackageNameFromModelName(workPackageName), componentName, commitMessage);
 	}
 
 	/**
@@ -608,7 +608,7 @@ public String pushComponent(@RequestParam(value = "workPackageName") String work
 			@RequestParam(value = "password") String password) {
 		logger.info("Push Component to Local Repository. component[" + componentName + "]git[" + gitName
 				+ "]workspace[" + workPackageName + "]commitMessage[" + commitMessage + "]userName[" + userName + "]");
-		return mainService.pushComponent(StringUtil.getPackageNameFromModelName(workPackageName), gitName, commitMessage, userName, password);
+		return mainService.pushComponent(StringUtil.getPackageNameFromModelName(workPackageName), componentName, commitMessage, userName, password);
 	}
 
 	/**
@@ -630,7 +630,7 @@ public String pullComponent(@RequestParam(value = "workPackageName") String work
 			@RequestParam(value = "password") String password) {
 		logger.info("Pull Component from Local Repository. component[" + componentName + "]git[" + gitName
 				+ "]workspace[" + workPackageName + "]userName[" + userName + "]");
-		return mainService.pullComponent(StringUtil.getPackageNameFromModelName(workPackageName), gitName, userName, password);
+		return mainService.pullComponent(StringUtil.getPackageNameFromModelName(workPackageName), componentName, userName, password);
 	}
 
 	/**

airgraph/src/main/java/com/sec/airgraph/service/IdeManagementService.java

@@ -129,18 +129,19 @@ public String pullPackage(String workPackageName, String userName, String passwo
 	 * ComponentをローカルリポジトリにCommitする
 	 * 
 	 * @param workPackageName
+	 * @param componentName
 	 * @param commitMessage
 	 */
-	public String commitComponent(String workPackageName, String gitName, String commitMessage) {
+	public String commitComponent(String workPackageName, String componentName, String commitMessage) {
 		// 作業領域パス
 		String workspaceDirPath = PropUtil.getValue("workspace.local.directory.path");
 		String rtcDirPath = StringUtil.concatenate(File.separator, workspaceDirPath, workPackageName,
-				DIR_NAME.PACKAGE_RTC_DIR_NAME, gitName);
+				DIR_NAME.PACKAGE_RTC_DIR_NAME, componentName);
 
 		// Commitする
 		String result = GitUtil.gitCommit(rtcDirPath, commitMessage);
 
-		logger.info("Commit Component. package[" + workPackageName + "]gitName[" + gitName + "]result[" + result + "]");
+		logger.info("Commit Component. package[" + workPackageName + "]componentName[" + componentName + "]result[" + result + "]");
 
 		return result;
 	}
@@ -149,13 +150,15 @@ public String commitComponent(String workPackageName, String gitName, String com
 	 * ComponentをリモートリポジトリにPushする
 	 * 
 	 * @param workPackageName
-	 * @param gitName
+	 * @param componentName
+	 * @param userName
+	 * @param password
 	 */
-	public String pushComponent(String workPackageName, String gitName, String userName, String password) {
+	public String pushComponent(String workPackageName, String componentName, String userName, String password) {
 		// 作業領域パス
 		String workspaceDirPath = PropUtil.getValue("workspace.local.directory.path");
 		String rtcDirPath = StringUtil.concatenate(File.separator, workspaceDirPath, workPackageName,
-				DIR_NAME.PACKAGE_RTC_DIR_NAME, gitName);
+				DIR_NAME.PACKAGE_RTC_DIR_NAME, componentName);
 
 		// URLをID/Pass付きに変換する
 		String gitUrl = GitUtil.getGitUrl(rtcDirPath).trim();
@@ -177,7 +180,7 @@ public String pushComponent(String workPackageName, String gitName, String userN
 		// URLを戻す
 		GitUtil.changeRemoteUrl(rtcDirPath, gitUrl);
 
-		logger.info("Push Component. package[" + workPackageName + "]gitName[" + gitName + "]result[" + result + "]");
+		logger.info("Push Component. package[" + workPackageName + "]componentName[" + componentName + "]result[" + result + "]");
 
 		return result;
 	}
@@ -186,13 +189,15 @@ public String pushComponent(String workPackageName, String gitName, String userN
 	 * ComponentをリモートリポジトリからPullする
 	 * 
 	 * @param workPackageName
-	 * @param gitName
+	 * @param componentName
+	 * @param userName
+	 * @param password
 	 */
-	public String pullComponent(String workPackageName, String gitName, String userName, String password) {
+	public String pullComponent(String workPackageName, String componentName, String userName, String password) {
 		// 作業領域パス
 		String workspaceDirPath = PropUtil.getValue("workspace.local.directory.path");
 		String rtcDirPath = StringUtil.concatenate(File.separator, workspaceDirPath, workPackageName,
-				DIR_NAME.PACKAGE_RTC_DIR_NAME, gitName);
+				DIR_NAME.PACKAGE_RTC_DIR_NAME, componentName);
 
 		// URLをID/Pass付きに変換する
 		String gitUrl = GitUtil.getGitUrl(rtcDirPath).trim();
@@ -214,7 +219,7 @@ public String pullComponent(String workPackageName, String gitName, String userN
 		// URLを戻す
 		GitUtil.changeRemoteUrl(rtcDirPath, gitUrl);
 
-		logger.info("Pull Component. package[" + workPackageName + "]gitName[" + gitName + "]result[" + result + "]");
+		logger.info("Pull Component. package[" + workPackageName + "]componentName[" + componentName + "]result[" + result + "]");
 
 		return result;
 	}

airgraph/src/main/java/com/sec/airgraph/service/MainService.java

@@ -472,28 +472,28 @@ public String pullPackage(String workPackageName, String userName, String passwo
 	 * RTCをローカルリポジトリにCommitする
 	 * 
 	 * @param workPackageName
-	 * @param gitName
+	 * @param componentName
 	 * @param commitMessage
 	 */
-	public String commitComponent(String workPackageName, String gitName, String commitMessage) {
-		return ideManagementService.commitComponent(workPackageName, gitName, commitMessage);
+	public String commitComponent(String workPackageName, String componentName, String commitMessage) {
+		return ideManagementService.commitComponent(workPackageName, componentName, commitMessage);
 	}
 
 	/**
 	 * RTCをリモートリポジトリにPushする
 	 * 
 	 * @param workPackageName
-	 * @param gitName
+	 * @param componentName
 	 * @param commitMessage
 	 * @param userName
 	 * @param password
 	 * @return
 	 */
-	public String pushComponent(String workPackageName, String gitName, String commitMessage, String userName, String password) {
+	public String pushComponent(String workPackageName, String componentName, String commitMessage, String userName, String password) {
 		StringBuilder sb = new StringBuilder();
 
-		String rsltCommit = ideManagementService.commitComponent(workPackageName, gitName, commitMessage);
-		String rsltPush = ideManagementService.pushComponent(workPackageName, gitName, userName, password);
+		String rsltCommit = ideManagementService.commitComponent(workPackageName, componentName, commitMessage);
+		String rsltPush = ideManagementService.pushComponent(workPackageName, componentName, userName, password);
 
 		if (StringUtil.isNotEmpty(rsltCommit)) {
 			sb.append(rsltCommit);
@@ -511,13 +511,13 @@ public String pushComponent(String workPackageName, String gitName, String commi
 	 * RTCをリモートリポジトリからPullする
 	 * 
 	 * @param workPackageName
-	 * @param gitName
+	 * @param componentName
 	 * @param userName
 	 * @param password
 	 * @return
 	 */
-	public String pullComponent(String workPackageName, String gitName, String userName, String password) {
-		return ideManagementService.pullComponent(workPackageName, gitName, userName, password);
+	public String pullComponent(String workPackageName, String componentName, String userName, String password) {
+		return ideManagementService.pullComponent(workPackageName, componentName, userName, password);
 	}
 
 	/**