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, 36 insertions, 27 deletions

diff --git a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
index 16d2e550fe..9ada06042d 100644
--- a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
+++ b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
@@ -154,37 +154,37 @@
     <ClInclude Include="..\..\..\..\test\cpp\util\metrics_server.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\proto\empty.pb.cc">
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\empty.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\..\test\proto\empty.pb.h">
+    <ClInclude Include="..\..\..\..\src\proto\grpc\testing\empty.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\..\test\proto\empty.grpc.pb.cc">
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\empty.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\..\test\proto\empty.grpc.pb.h">
+    <ClInclude Include="..\..\..\..\src\proto\grpc\testing\empty.grpc.pb.h">
     </ClInclude>
-    <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\metrics.pb.cc">
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\metrics.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\..\test\proto\metrics.pb.h">
+    <ClInclude Include="..\..\..\..\src\proto\grpc\testing\metrics.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\..\test\proto\metrics.grpc.pb.cc">
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\metrics.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\..\test\proto\metrics.grpc.pb.h">
+    <ClInclude Include="..\..\..\..\src\proto\grpc\testing\metrics.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\..\test\proto\test.pb.cc">
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\test.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\..\test\proto\test.pb.h">
+    <ClInclude Include="..\..\..\..\src\proto\grpc\testing\test.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\..\test\proto\test.grpc.pb.cc">
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\test.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\..\test\proto\test.grpc.pb.h">
+    <ClInclude Include="..\..\..\..\src\proto\grpc\testing\test.grpc.pb.h">
     </ClInclude>
     <ClCompile Include="..\..\..\..\test\cpp\interop\interop_client.cc">
     </ClCompile>
diff --git a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
index b20bd35723..a61fd224aa 100644
--- a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
+++ b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\proto\empty.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\empty.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <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\metrics.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\metrics.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\proto\test.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\..\src\proto\grpc\testing\test.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\test\cpp\interop\interop_client.cc">
       <Filter>test\cpp\interop</Filter>
@@ -42,6 +42,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{2240848e-b50a-4076-464a-786310b2d6be}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto">
+      <UniqueIdentifier>{aaad45c2-b399-83f4-5950-6d90d3ee1c32}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto\grpc">
+      <UniqueIdentifier>{1a3222d0-0e47-792c-188e-207fcd8286c5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto\grpc\testing">
+      <UniqueIdentifier>{7f2f0ad6-9e60-abd3-c178-d82a346be435}</UniqueIdentifier>
+    </Filter>
     <Filter Include="test">
       <UniqueIdentifier>{0fddcdfd-8fd7-bb4b-e21d-f53728f4a766}</UniqueIdentifier>
     </Filter>
@@ -54,9 +66,6 @@
     <Filter Include="test\cpp\util">
       <UniqueIdentifier>{e4704307-621e-0e9c-08c2-3c698c1b827f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="test\proto">
-      <UniqueIdentifier>{7172a335-47bf-8284-380d-a28a05c07311}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>