qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1785269 - in /qpid/java/trunk/broker-plugins/jdbc-store/src/main/java: org/apache/qpid/server/virtualhost/jdbc/ org/apache/qpid/server/virtualhostnode/jdbc/ resources/virtualhost/jdbc/ resources/virtualhostnode/jdbc/
Date Fri, 03 Mar 2017 11:45:35 GMT
Author: orudyy
Date: Fri Mar  3 11:45:35 2017
New Revision: 1785269

URL: http://svn.apache.org/viewvc?rev=1785269&view=rev
Log:
QPID-7558: [Java Broker] Make attributes for table name prefix unsecure
           and immutable, and modify corresponding UI to allow entering
           of table prefixes.

Modified:
    qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
    qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
    qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
    qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html

Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java?rev=1785269&r1=1785268&r2=1785269&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
(original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
Fri Mar  3 11:45:35 2017
@@ -41,13 +41,15 @@ public interface JDBCVirtualHost<X exten
     @ManagedAttribute(secure=true)
     String getPassword();
 
-    @ManagedContextDefault(name = "jdbcvirtualhost.tableNamePrefix")
+    @ManagedContextDefault(name = "jdbcvirtualhost.tableNamePrefix",
+            description = "Default value for optional database table prefix")
     String DEFAULT_JDBC_VIRTUALHOST_TABLE_NAME_PREFIX = "";
 
-    @ManagedAttribute(secure = true,
+    @ManagedAttribute(
             description = "Optional database table prefix so multiple VirtualHosts can share
the same database",
             defaultValue = "${jdbcvirtualhost.tableNamePrefix}",
-            validValuePattern = "[a-zA-Z_0-9]*")
+            validValuePattern = "[a-zA-Z_0-9]*",
+            immutable = true)
     String getTableNamePrefix();
 
 }

Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java?rev=1785269&r1=1785268&r2=1785269&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
(original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
Fri Mar  3 11:45:35 2017
@@ -48,12 +48,14 @@ public interface JDBCVirtualHostNode<X e
             defaultValue = "{\"type\": \"Provided\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();
 
-    @ManagedContextDefault(name = "jdbcvirtualhostnode.tableNamePrefix")
+    @ManagedContextDefault(name = "jdbcvirtualhostnode.tableNamePrefix",
+            description = "Default value for optional database table prefix")
     String DEFAULT_JDBC_VIRTUALHOSTNODE_TABLE_NAME_PREFIX = "";
 
-    @ManagedAttribute(secure = true,
+    @ManagedAttribute(
             description = "Optional database table prefix so multiple VirtualHostNodes can
share the same database",
             defaultValue = "${jdbcvirtualhostnode.tableNamePrefix}",
-            validValuePattern = "[a-zA-Z_0-9]*")
+            validValuePattern = "[a-zA-Z_0-9]*",
+            immutable = true)
     String getTableNamePrefix();
 }

Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html?rev=1785269&r1=1785268&r2=1785269&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
(original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
Fri Mar  3 11:45:35 2017
@@ -69,7 +69,20 @@
                               placeHolder: 'Select pool type'" />
       </div>
     </div>
-
+    <div class="clear">
+        <div class="formLabel-labelCell tableContainer-labelCell">Table name prefix:</div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <input type="text" id="addVirtualHost.tableNamePrefix"
+                   data-dojo-type="dijit/form/ValidationTextBox"
+                   data-dojo-props="
+                              name: 'tableNamePrefix',
+                              placeHolder: 'table name prefix',
+                              required: false,
+                              regExp: '[a-zA-Z_0-9]*',
+                              promptMessage: 'Optional database table prefix so multiple
VirtualHosts can share the same database',
+                              title: 'Optional database table prefix so multiple VirtualHosts
can share the same database'" />
+        </div>
+    </div>
     <div class="clear"></div>
     <div id="addVirtualHost.poolSpecificDiv"></div>
     <div class="infoMessage">The virtual host will have the same name as the node.</div>

Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html?rev=1785269&r1=1785268&r2=1785269&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
(original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
Fri Mar  3 11:45:35 2017
@@ -71,7 +71,20 @@
                               placeHolder: 'Select pool type'" />
       </div>
     </div>
-
+    <div class="clear">
+        <div class="formLabel-labelCell tableContainer-labelCell">Table name prefix:</div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <input type="text" id="addVirtualHostNode.tableNamePrefix"
+                   data-dojo-type="dijit/form/ValidationTextBox"
+                   data-dojo-props="
+                              name: 'tableNamePrefix',
+                              placeHolder: 'table name prefix',
+                              required: false,
+                              regExp: '[a-zA-Z_0-9]*',
+                              promptMessage: 'Optional database table prefix so multiple
VirtualHostNodes can share the same database',
+                              title: 'Optional database table prefix so multiple VirtualHostNodes
can share the same database'" />
+        </div>
+    </div>
     <div class="clear"></div>
     <div id="addVirtualHostNode.poolSpecificDiv"></div>
 </div>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message