Consolidate C++ proto files under src/proto

- make the directory structure match the package structure
- sanitize the package structure (test --> testing)
- add auto-detection of proto file dependencies

2 files changed, 48 insertions, 42 deletions

diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj
index 549a303292..f175efae5f 100644
--- a/vsprojects/vcxproj/qps/qps.vcxproj
+++ b/vsprojects/vcxproj/qps/qps.vcxproj
@@ -150,53 +150,53 @@
     <ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\proto\messages.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\messages.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\messages.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\messages.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\control.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\control.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\control.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\control.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\control.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\control.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\control.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\control.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\payloads.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\payloads.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\payloads.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\payloads.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\services.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\services.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\services.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\services.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\services.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\services.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\services.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\services.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\stats.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\stats.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\stats.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\cpp\qps\perf_db.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\cpp\qps\perf_db.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\perf_db.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\cpp\qps\perf_db.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\cpp\qps\perf_db.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\perf_db.grpc.pb.h">
     </ClInclude>
     <ClCompile Include="..\..\..\test\cpp\qps\client_async.cc">
     </ClCompile>
diff --git a/vsprojects/vcxproj/qps/qps.vcxproj.filters b/vsprojects/vcxproj/qps/qps.vcxproj.filters
index afa7195316..1e416ba4e6 100644
--- a/vsprojects/vcxproj/qps/qps.vcxproj.filters
+++ b/vsprojects/vcxproj/qps/qps.vcxproj.filters
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\proto\messages.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\control.proto">
-      <Filter>test\proto\benchmarks</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\control.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.proto">
-      <Filter>test\proto\benchmarks</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\services.proto">
-      <Filter>test\proto\benchmarks</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\services.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.proto">
-      <Filter>test\proto\benchmarks</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\perf_db.proto">
-      <Filter>test\cpp\qps</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\test\cpp\qps\client_async.cc">
       <Filter>test\cpp\qps</Filter>
@@ -87,6 +87,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{0a68b7ce-1b1a-8927-e173-5e8d7ebecf8a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto">
+      <UniqueIdentifier>{7e654fb3-2440-c5ad-9cc1-c6c425cd91bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto\grpc">
+      <UniqueIdentifier>{d95c9d8c-ad29-576f-c974-aafa292a361e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto\grpc\testing">
+      <UniqueIdentifier>{0878a4bc-7ae5-7cad-e2e1-3a91cc0e7b59}</UniqueIdentifier>
+    </Filter>
     <Filter Include="test">
       <UniqueIdentifier>{2d898a55-573b-f256-2336-bddd04eb7c70}</UniqueIdentifier>
     </Filter>
@@ -99,12 +111,6 @@
     <Filter Include="test\cpp\util">
       <UniqueIdentifier>{9042d134-6d5a-a907-799e-01768a475055}</UniqueIdentifier>
     </Filter>
-    <Filter Include="test\proto">
-      <UniqueIdentifier>{44e63a33-67f4-0575-e87a-711a7c9111e2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="test\proto\benchmarks">
-      <UniqueIdentifier>{4180a094-39b4-e46c-1576-940bfe87d284}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>