Merge pull request elastic#471 from Tom-Artale/allconf-password-change

Fixup name of AllConf proto file so it is picked up by generator
harper-carroll · Feb 16, 2016 · 6c386aa · 6c386aa
2 parents c96bca9 + 8acaa70
commit 6c386aa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/protofiles/configelements/AllConf.proto → ...ofiles/configelements/AllConfConfig.proto b/protofiles/configelements/AllConf.proto → ...ofiles/configelements/AllConfConfig.proto
@@ -11,10 +11,10 @@ message AllConfConfig {
    optional string assetPath = 3;
    optional string configServerQueue = 4;
 
-//   optional string adminUsername = 5;
-//   optional string adminPassword = 6;
-//   optional string devUsername = 7;
-//   optional string devPassword = 8;
+// DEPRECATED  optional string adminUsername = 5;
+// DEPRECATED  optional string adminPassword = 6;
+// DEPRECATED  optional string devUsername = 7;
+// DEPRECATED  optional string devPassword = 8;
 
    optional EncryptedString administratorUsername = 9;
    optional EncryptedString administratorPassword = 10;

diff --git a/protofiles/configelements/ux/AllConfConfigUX.proto b/protofiles/configelements/ux/AllConfConfigUX.proto
@@ -0,0 +1,25 @@
+package configelements.ux;
+
+import "ConfigUX.proto";
+
+
+
+option java_package = "com.logrhythm.configelements.ux";
+option java_outer_classname = "AllConfConfigUXMsg";
+
+message AllConfConfigUX {
+   optional ConfigUX hostIp = 1;
+   optional ConfigUX hostPort = 2;
+   optional ConfigUX assetPath = 3;
+   optional ConfigUX configServerQueue = 4;
+
+//   optional ConfigUX adminUsername = 5;
+//   optional ConfigUX adminPassword = 6;
+//   optional ConfigUX devUsername = 7;
+//   optional ConfigUX devPassword = 8;
+
+   optional ConfigUX administratorUsername = 9;
+   optional ConfigUX administratorPassword = 10;
+   optional ConfigUX developerUsername = 11;
+   optional ConfigUX developerPassword = 12;
+}