From: donghee yang <donghee.yang@samsung.com>
Date: Mon, 27 Aug 2012 12:29:06 +0000 (+0900)
Subject: [Title] Removed "outgoing_path" for BuildServer
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0926c03da5d542fa806c33b22f86fff6d605507c;p=sdk%2Ftools%2Fsdk-build.git

[Title] Removed "outgoing_path" for BuildServer
---

diff --git a/src/build_server/BinaryUploadProject.rb b/src/build_server/BinaryUploadProject.rb
index e6c20bc..580ad99 100644
--- a/src/build_server/BinaryUploadProject.rb
+++ b/src/build_server/BinaryUploadProject.rb
@@ -57,7 +57,7 @@ class BinaryUploadProject < CommonProject
 		if not @server.supported_os_list.include? os then return nil end
 
 		# check package info
-		file_path = "#{@server.incoming_path}/#{filename}"
+		file_path = "#{@server.transport_path}/#{filename}"
 		if not File.exist? file_path then return nil end
 
 		pkginfo_dir = "#{@server.path}/projects/#{@name}/pkginfos"
@@ -75,7 +75,7 @@ class BinaryUploadProject < CommonProject
 		if pkgs.count != 1 then return nil end
 		if pkgs[0].package_name != @pkg_name then return nil end
 
-		new_job = RegisterPackageJob.new( "#{@server.incoming_path}/#{filename}", self, @server )
+		new_job = RegisterPackageJob.new( "#{@server.transport_path}/#{filename}", self, @server )
 
 		return new_job
 	end
diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index d5695a5..e9dd114 100644
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -564,7 +564,7 @@ class BuildJob
 			return false
 		end
 
-		# copy result files to outgoing path
+		# copy result files to transport path
 		if @is_internal_job then
 			copy_result_files_to_master()
 		elsif not @parent.nil? and not @is_rev_build_check_job then
@@ -1075,9 +1075,9 @@ class BuildJob
 	end
 
 
-	# copy binary package files and log file to outgoing dir
+	# copy binary package files and log file to transport dir
 	def copy_result_files_to_master()
-		outgoing_dir = "#{@server.incoming_path}/#{@dock_num}"
+		outgoing_dir = "#{@server.transport_path}/#{@dock_num}"
 
 		@log.info( "Copying log to #{outgoing_dir}", Log::LV_USER)
 		file = "#{@source_path}/../log"
diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index e635878..cb47347 100644
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -54,7 +54,7 @@ class BuildServer
 	attr_accessor :ftp_passwd
 	attr_accessor :cleaner
 	attr_accessor :prjmgr
-	attr_accessor :incoming_path, :outgoing_path
+	attr_accessor :transport_path
 	attr_accessor :cancel_lock
 	attr_accessor :supported_os_list
 	attr_accessor :remote_pkg_servers
@@ -102,8 +102,7 @@ class BuildServer
 		@cleaner=nil
 		@prjmgr = ProjectManager.new(self)
 		# 
-		@incoming_path = "#{@path}/incoming"
-		@outgoing_path = "#{@path}/outgoing"
+		@transport_path = "#{@path}/transport"
 		@cancel_lock = Mutex.new
 		@supported_os_list = []
 
@@ -122,9 +121,8 @@ class BuildServer
 			FileUtils.mkdir_p @build_cache_dir
 		end
 
-		# init incoming/outgoing path
-		if not File.exist? @incoming_path then FileUtils.mkdir_p @incoming_path end
-		if not File.exist? @outgoing_path then FileUtils.mkdir_p @outgoing_path end
+		# init transport path
+		if not File.exist? @transport_path then FileUtils.mkdir_p @transport_path end
 
 		# init project mgr
 		@log.info "Setting Project Manager..."
diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb
index 94afb7e..5b1b696 100644
--- a/src/build_server/GitBuildJob.rb
+++ b/src/build_server/GitBuildJob.rb
@@ -123,7 +123,7 @@ class GitBuildJob < BuildJob
 			@log.info( "Copying external dependent pkgs...", Log::LV_USER)
 			ext_pkgs_dir = "#{@job_root}/external_pkgs" 
 
-			incoming_dir = "#{@server.incoming_path}/#{@dock_num}"
+			incoming_dir = "#{@server.transport_path}/#{@dock_num}"
 			if File.exist? incoming_dir then
 				FileUtils.mv "#{incoming_dir}", "#{ext_pkgs_dir}"
 			end
diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index 66355d5..0af0cc2 100644
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -621,7 +621,7 @@ class SocketJobRequestListener
 
 		BuildCommServer.send_begin(req)
 		begin
-			incoming_dir = "#{@parent_server.incoming_path}/#{dock_num}"
+			incoming_dir = "#{@parent_server.transport_path}/#{dock_num}"
 			if not File.exist? incoming_dir then FileUtils.mkdir_p incoming_dir end
 			@comm_server.receive_file( req, incoming_dir )
 		rescue => e
@@ -647,7 +647,7 @@ class SocketJobRequestListener
 		file_name = tok[2]
 	
 		@log.info "Received a request for download file : #{file_name}"
-		outgoing_dir = "#{@parent_server.incoming_path}/#{dock_num}"
+		outgoing_dir = "#{@parent_server.transport_path}/#{dock_num}"
 		BuildCommServer.send_begin(req)
 		begin
 			@log.info "Sending requested file...: #{file_name}"
@@ -809,7 +809,7 @@ class SocketJobRequestListener
 		new_job = prj.create_new_job(os)
 		new_job.set_internal_job( dock_num ) 
 		new_job.set_git_commit(git_commit)
-		incoming_dir = "#{@parent_server.incoming_path}/#{dock_num}"
+		incoming_dir = "#{@parent_server.transport_path}/#{dock_num}"
 		pkg_files.each { |file|
 			new_job.add_external_package( file )
 		}