From 8acaa70fce7c528fb984d96e5494c459e75c2445 Mon Sep 17 00:00:00 2001
From: Tom Artale <tom.artale@usmac1456tarta.schq.secious.com>
Date: Tue, 16 Feb 2016 15:39:16 -0700
Subject: [PATCH] Fixup name of AllConf proto file so it is picked up by
 generator

---
 .../{AllConf.proto => AllConfConfig.proto}    |  8 +++---
 .../configelements/ux/AllConfConfigUX.proto   | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)
 rename protofiles/configelements/{AllConf.proto => AllConfConfig.proto} (73%)
 create mode 100644 protofiles/configelements/ux/AllConfConfigUX.proto

diff --git a/protofiles/configelements/AllConf.proto b/protofiles/configelements/AllConfConfig.proto
similarity index 73%
rename from protofiles/configelements/AllConf.proto
rename to protofiles/configelements/AllConfConfig.proto
index e520c34fe246b..8930441c1e256 100644
--- a/protofiles/configelements/AllConf.proto
+++ b/protofiles/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
new file mode 100644
index 0000000000000..5f6824afb20e9
--- /dev/null
+++ 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;
+}