Merge "Use entry_points for server executables"

setup.cfg

@@ -47,12 +47,10 @@ scripts =
     bin/swift-account-info
     bin/swift-account-reaper
     bin/swift-account-replicator
-    bin/swift-account-server
     bin/swift-config
     bin/swift-container-auditor
     bin/swift-container-info
     bin/swift-container-replicator
-    bin/swift-container-server
     bin/swift-container-sharder
     bin/swift-container-sync
     bin/swift-container-updater
@@ -70,11 +68,9 @@ scripts =
     bin/swift-object-replicator
     bin/swift-object-reconstructor
     bin/swift-object-relinker
-    bin/swift-object-server
     bin/swift-object-updater
     bin/swift-oldies
     bin/swift-orphans
-    bin/swift-proxy-server
     bin/swift-recon
     bin/swift-recon-cron
     bin/swift-ring-builder
@@ -94,8 +90,12 @@ keystone =
 
 [entry_points]
 console_scripts =
-    swift-manage-shard-ranges = swift.cli.manage_shard_ranges:main
+    swift-account-server = swift.account.server:main
     swift-container-deleter = swift.cli.container_deleter:main
+    swift-container-server = swift.container.server:main
+    swift-manage-shard-ranges = swift.cli.manage_shard_ranges:main
+    swift-object-server = swift.obj.server:main
+    swift-proxy-server = swift.proxy.server:main
     swift-reload = swift.cli.reload:main
 
 paste.app_factory =