You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/04/23 22:54:24 UTC
svn commit: r1471141 [1/11] - in /qpid/branches/QPID-4659/qpid/java: ./
amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/
broker-plugins/access-control/src/main/java/org/apache/qpid...
Author: rgodfrey
Date: Tue Apr 23 20:54:19 2013
New Revision: 1471141
URL: http://svn.apache.org/r1471141
Log:
Merged up to r1465457
Added:
qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/FileAccessControlProviderAttributeDescriptions.properties
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/FileAccessControlProviderAttributeDescriptions.properties
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
- copied, changed from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
- copied, changed from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/
- copied from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java
- copied unchanged from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
- copied unchanged from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAccessControlProviderAttributes.java
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAccessControlProviderAttributes.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListGroupProviderAttributes.java
- copied unchanged from r1469916, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListGroupProviderAttributes.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/
- copied from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
- copied, changed from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
- copied unchanged from r1467334, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
- copied unchanged from r1470899, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
- copied unchanged from r1467334, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/
- copied from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
- copied unchanged from r1469916, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
- copied unchanged from r1467334, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
- copied unchanged from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
- copied unchanged from r1467334, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
- copied unchanged from r1470899, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
- copied unchanged from r1467334, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
- copied, changed from r1467334, qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/AccessControlProviderRecoverer.java
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/AccessControlProviderRecoverer.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreUtil.java
- copied unchanged from r1467932, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreUtil.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderFactory.java
- copied unchanged from r1469916, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java
- copied unchanged from r1469937, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/jmx/
- copied from r1468830, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/jmx/
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (contents, props changed)
- copied, changed from r1470454, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/
- copied from r1470454, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
- copied unchanged from r1470454, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
- copied unchanged from r1470454, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/util/StringUtil.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/StringUtil.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/resources/initial-config.json
- copied, changed from r1467938, qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/
- copied from r1468815, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
- copied unchanged from r1468815, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/jmx/
- copied from r1468830, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/jmx/
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslUtil.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslUtil.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/group/FileGroupProviderAttributeDescriptions.properties
- copied unchanged from r1469916, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/group/FileGroupProviderAttributeDescriptions.properties
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/util/StringUtilTest.java
- copied unchanged from r1468830, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/StringUtilTest.java
qpid/branches/QPID-4659/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java
- copied unchanged from r1467334, qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
- copied unchanged from r1471004, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
- copied unchanged from r1465590, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
- copied, changed from r1467334, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
- copied, changed from r1467334, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
Removed:
qpid/branches/QPID-4659/qpid/java/broker/etc/virtualhosts.xml
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/resources/initial-store.json
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml
qpid/branches/QPID-4659/qpid/java/systests/etc/config-systests.xml
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
Modified:
qpid/branches/QPID-4659/qpid/java/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java
qpid/branches/QPID-4659/qpid/java/broker/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogoutServlet.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListMessageStoreTypes.java
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/branches/QPID-4659/qpid/java/broker/bin/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/etc/md5passwd
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecoverer.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/GroupProviderRecoverer.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/KeyStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/TrustStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java (contents, props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java (contents, props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AccessControl.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SubjectCreator.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupManager.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupManagerFactory.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/GroupManager.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/GroupProviderRecovererTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/model/BrokerShutdownTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerFactoryTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
qpid/branches/QPID-4659/qpid/java/build.deps
qpid/branches/QPID-4659/qpid/java/client/example/src/main/java/org/apache/qpid/example/hello.properties
qpid/branches/QPID-4659/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
qpid/branches/QPID-4659/qpid/java/ivy.retrieve.xml
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/QPID-4659/qpid/java/systests/etc/config-systests.json
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed)
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (contents, props changed)
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
qpid/branches/QPID-4659/qpid/java/test-profiles/ (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/CPPExcludes (contents, props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/Excludes (contents, props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/Java010Excludes
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaPre010Excludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/testprofile.defaults (props changed)
Propchange: qpid/branches/QPID-4659/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1463061,1465459,1465590,1466482,1467334,1467922,1467930,1467932,1467938,1467940,1467992,1468815-1468816,1468830,1468875,1468953,1469256,1469914,1469916-1469917,1469937,1470439,1470454,1470457,1470463,1470474,1470897,1470899,1471004
Propchange: qpid/branches/QPID-4659/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1463061,1465459,1465590,1466482,1467334,1467922,1467930,1467932,1467938,1467940,1467992,1468815-1468816,1468830,1468875,1468953,1469256,1469914,1469916-1469917,1469937,1470439,1470454,1470457,1470463,1470474,1470897,1470899,1471004
Propchange: qpid/branches/QPID-4659/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1463061,1465459,1465590,1466482,1467334,1467922,1467930,1467932,1467938,1467940,1467992,1468815-1468816,1468830,1468875,1468953,1469256,1469914,1469916-1469917,1469937,1470439,1470454,1470457,1470463,1470474,1470897,1470899,1471004
Propchange: qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1463061,1465459,1465590,1466482,1467334,1467922,1467930,1467932,1467938,1467940,1467992,1468815-1468816,1468830,1468875,1468953,1469256,1469914,1469916-1469917,1469937,1470439,1470454,1470457,1470463,1470474,1470897,1470899,1471004
Modified: qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java?rev=1471141&r1=1471140&r2=1471141&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java (original)
+++ qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java Tue Apr 23 20:54:19 2013
@@ -21,7 +21,8 @@
package org.apache.qpid.amqp_1_0.transport;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.amqp_1_0.codec.ValueWriter;
import org.apache.qpid.amqp_1_0.framing.AMQFrame;
@@ -59,12 +60,15 @@ public class ConnectionEndpoint implemen
{
private static final short CONNECTION_CONTROL_CHANNEL = (short) 0;
private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
+ private static final Symbol SASL_PLAIN = Symbol.valueOf("PLAIN");
+ private static final Symbol SASL_ANONYMOUS = Symbol.valueOf("ANONYMOUS");
+ private static final Symbol SASL_EXTERNAL = Symbol.valueOf("EXTERNAL");
private final Container _container;
private Principal _user;
private static final short DEFAULT_CHANNEL_MAX = 255;
- private static final int DEFAULT_MAX_FRAME = Integer.getInteger("amqp.max_frame_size",1<<15);
+ private static final int DEFAULT_MAX_FRAME = Integer.getInteger("amqp.max_frame_size", 1 << 15);
private ConnectionState _state = ConnectionState.UNOPENED;
@@ -75,20 +79,20 @@ public class ConnectionEndpoint implemen
private SocketAddress _remoteAddress;
// positioned by the *outgoing* channel
- private SessionEndpoint[] _sendingSessions = new SessionEndpoint[DEFAULT_CHANNEL_MAX+1];
+ private SessionEndpoint[] _sendingSessions = new SessionEndpoint[DEFAULT_CHANNEL_MAX + 1];
// positioned by the *incoming* channel
- private SessionEndpoint[] _receivingSessions = new SessionEndpoint[DEFAULT_CHANNEL_MAX+1];
+ private SessionEndpoint[] _receivingSessions = new SessionEndpoint[DEFAULT_CHANNEL_MAX + 1];
private boolean _closedForInput;
private boolean _closedForOutput;
private long _idleTimeout;
private AMQPDescribedTypeRegistry _describedTypeRegistry = AMQPDescribedTypeRegistry.newInstance()
- .registerTransportLayer()
- .registerMessagingLayer()
- .registerTransactionLayer()
- .registerSecurityLayer();
+ .registerTransportLayer()
+ .registerMessagingLayer()
+ .registerTransactionLayer()
+ .registerSecurityLayer();
private FrameOutputHandler<FrameBody> _frameOutputHandler;
@@ -135,11 +139,11 @@ public class ConnectionEndpoint implemen
public synchronized void open()
{
- if(_requiresSASLClient)
+ if (_requiresSASLClient)
{
synchronized (getLock())
{
- while(!_saslComplete)
+ while (!_saslComplete)
{
try
{
@@ -151,12 +155,12 @@ public class ConnectionEndpoint implemen
}
}
}
- if(!_authenticated)
+ if (!_authenticated)
{
throw new RuntimeException("Could not connect - authentication error");
}
}
- if(_state == ConnectionState.UNOPENED)
+ if (_state == ConnectionState.UNOPENED)
{
sendOpen(DEFAULT_CHANNEL_MAX, DEFAULT_MAX_FRAME);
_state = ConnectionState.AWAITING_OPEN;
@@ -172,8 +176,8 @@ public class ConnectionEndpoint implemen
{
// todo assert connection state
SessionEndpoint endpoint = new SessionEndpoint(this);
- short channel = getFirstFreeChannel();
- if(channel != -1)
+ short channel = getFirstFreeChannel();
+ if (channel != -1)
{
_sendingSessions[channel] = endpoint;
endpoint.setSendingChannel(channel);
@@ -244,8 +248,6 @@ public class ConnectionEndpoint implemen
}
-
-
private void closeSender()
{
setClosedForOutput(true);
@@ -255,9 +257,9 @@ public class ConnectionEndpoint implemen
short getFirstFreeChannel()
{
- for(int i = 0; i<_sendingSessions.length;i++)
+ for (int i = 0; i < _sendingSessions.length; i++)
{
- if(_sendingSessions[i]==null)
+ if (_sendingSessions[i] == null)
{
return (short) i;
}
@@ -276,22 +278,25 @@ public class ConnectionEndpoint implemen
{
_channelMax = open.getChannelMax() == null ? DEFAULT_CHANNEL_MAX
- : open.getChannelMax().shortValue() < DEFAULT_CHANNEL_MAX
- ? DEFAULT_CHANNEL_MAX
- : open.getChannelMax().shortValue();
-
- UnsignedInteger remoteDesiredMaxFrameSize = open.getMaxFrameSize() == null ? UnsignedInteger.valueOf(DEFAULT_MAX_FRAME) : open.getMaxFrameSize();
-
- _maxFrameSize = (remoteDesiredMaxFrameSize.compareTo(_desiredMaxFrameSize) < 0 ? remoteDesiredMaxFrameSize : _desiredMaxFrameSize).intValue();
+ : open.getChannelMax().shortValue() < DEFAULT_CHANNEL_MAX
+ ? DEFAULT_CHANNEL_MAX
+ : open.getChannelMax().shortValue();
+
+ UnsignedInteger remoteDesiredMaxFrameSize =
+ open.getMaxFrameSize() == null ? UnsignedInteger.valueOf(DEFAULT_MAX_FRAME) : open.getMaxFrameSize();
+
+ _maxFrameSize = (remoteDesiredMaxFrameSize.compareTo(_desiredMaxFrameSize) < 0
+ ? remoteDesiredMaxFrameSize
+ : _desiredMaxFrameSize).intValue();
_remoteContainerId = open.getContainerId();
- if(open.getIdleTimeOut() != null)
+ if (open.getIdleTimeOut() != null)
{
_idleTimeout = open.getIdleTimeOut().longValue();
}
- switch(_state)
+ switch (_state)
{
case UNOPENED:
sendOpen(_channelMax, _maxFrameSize);
@@ -313,7 +318,7 @@ public class ConnectionEndpoint implemen
{
setClosedForInput(true);
_connectionEventListener.closeReceived();
- switch(_state)
+ switch (_state)
{
case UNOPENED:
case AWAITING_OPEN:
@@ -341,7 +346,7 @@ public class ConnectionEndpoint implemen
{
Close close = new Close();
close.setError(error);
- switch(_state)
+ switch (_state)
{
case UNOPENED:
_state = ConnectionState.CLOSED;
@@ -359,17 +364,17 @@ public class ConnectionEndpoint implemen
}
}
- public synchronized void inputClosed()
+ public synchronized void inputClosed()
{
- if(!_closedForInput)
+ if (!_closedForInput)
{
_closedForInput = true;
- for(int i = 0; i < _receivingSessions.length; i++)
+ for (int i = 0; i < _receivingSessions.length; i++)
{
- if(_receivingSessions[i] != null)
+ if (_receivingSessions[i] != null)
{
_receivingSessions[i].end();
- _receivingSessions[i]=null;
+ _receivingSessions[i] = null;
}
}
@@ -395,8 +400,7 @@ public class ConnectionEndpoint implemen
short myChannelId;
-
- if(begin.getRemoteChannel() != null)
+ if (begin.getRemoteChannel() != null)
{
myChannelId = begin.getRemoteChannel().shortValue();
SessionEndpoint endpoint;
@@ -404,7 +408,7 @@ public class ConnectionEndpoint implemen
{
endpoint = _sendingSessions[myChannelId];
}
- catch(IndexOutOfBoundsException e)
+ catch (IndexOutOfBoundsException e)
{
final Error error = new Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
@@ -414,9 +418,9 @@ public class ConnectionEndpoint implemen
connectionError(error);
return;
}
- if(endpoint != null)
+ if (endpoint != null)
{
- if(_receivingSessions[channel] == null)
+ if (_receivingSessions[channel] == null)
{
_receivingSessions[channel] = endpoint;
endpoint.setReceivingChannel(channel);
@@ -446,16 +450,16 @@ public class ConnectionEndpoint implemen
{
myChannelId = getFirstFreeChannel();
- if(myChannelId == -1)
+ if (myChannelId == -1)
{
// close any half open channel
myChannelId = getFirstFreeChannel();
}
- if(_receivingSessions[channel] == null)
+ if (_receivingSessions[channel] == null)
{
- SessionEndpoint endpoint = new SessionEndpoint(this,begin);
+ SessionEndpoint endpoint = new SessionEndpoint(this, begin);
_receivingSessions[channel] = endpoint;
_sendingSessions[myChannelId] = endpoint;
@@ -483,15 +487,13 @@ public class ConnectionEndpoint implemen
}
-
}
-
public synchronized void receiveEnd(short channel, End end)
{
SessionEndpoint endpoint = _receivingSessions[channel];
- if(endpoint != null)
+ if (endpoint != null)
{
_receivingSessions[channel] = null;
@@ -551,18 +553,18 @@ public class ConnectionEndpoint implemen
public synchronized int send(short channel, FrameBody body, ByteBuffer payload)
{
- if(!_closedForOutput)
+ if (!_closedForOutput)
{
ValueWriter<FrameBody> writer = _describedTypeRegistry.getValueWriter(body);
int size = writer.writeToBuffer(EMPTY_BYTE_BUFFER);
ByteBuffer payloadDup = payload == null ? null : payload.duplicate();
int payloadSent = getMaxFrameSize() - (size + 9);
- if(payloadSent < (payload == null ? 0 : payload.remaining()))
+ if (payloadSent < (payload == null ? 0 : payload.remaining()))
{
- if(body instanceof Transfer)
+ if (body instanceof Transfer)
{
- ((Transfer)body).setMore(Boolean.TRUE);
+ ((Transfer) body).setMore(Boolean.TRUE);
}
writer = _describedTypeRegistry.getValueWriter(body);
@@ -571,9 +573,9 @@ public class ConnectionEndpoint implemen
try
{
- payloadDup.limit(payloadDup.position()+payloadSent);
+ payloadDup.limit(payloadDup.position() + payloadSent);
}
- catch(NullPointerException npe)
+ catch (NullPointerException npe)
{
throw npe;
}
@@ -592,7 +594,6 @@ public class ConnectionEndpoint implemen
}
-
public void invalidHeaderReceived()
{
// TODO
@@ -606,7 +607,7 @@ public class ConnectionEndpoint implemen
public synchronized void protocolHeaderReceived(final byte major, final byte minorVersion, final byte revision)
{
- if(_requiresSASLServer && _state != ConnectionState.UNOPENED)
+ if (_requiresSASLServer && _state != ConnectionState.UNOPENED)
{
// TODO - bad stuff
}
@@ -618,7 +619,7 @@ public class ConnectionEndpoint implemen
public synchronized void handleError(final Error error)
{
- if(!closedForOutput())
+ if (!closedForOutput())
{
Close close = new Close();
close.setError(error);
@@ -631,17 +632,17 @@ public class ConnectionEndpoint implemen
public synchronized void receive(final short channel, final Object frame)
{
- if(_logger.isLoggable(Level.FINE))
+ if (_logger.isLoggable(Level.FINE))
{
- _logger.fine("RECV["+ _remoteAddress + "|"+channel+"] : " + frame);
+ _logger.fine("RECV[" + _remoteAddress + "|" + channel + "] : " + frame);
}
- if(frame instanceof FrameBody)
+ if (frame instanceof FrameBody)
{
- ((FrameBody)frame).invoke(channel, this);
+ ((FrameBody) frame).invoke(channel, this);
}
- else if(frame instanceof SaslFrameBody)
+ else if (frame instanceof SaslFrameBody)
{
- ((SaslFrameBody)frame).invoke(this);
+ ((SaslFrameBody) frame).invoke(this);
}
}
@@ -674,7 +675,7 @@ public class ConnectionEndpoint implemen
public synchronized void close()
{
- switch(_state)
+ switch (_state)
{
case AWAITING_OPEN:
case OPEN:
@@ -737,10 +738,11 @@ public class ConnectionEndpoint implemen
{
_saslComplete = true;
_authenticated = true;
+ _user = _saslServerProvider.getAuthenticatedPrincipal(_saslServer);
getLock().notifyAll();
}
- if(_onSaslCompleteTask != null)
+ if (_onSaslCompleteTask != null)
{
_onSaslCompleteTask.run();
}
@@ -766,7 +768,7 @@ public class ConnectionEndpoint implemen
_authenticated = false;
getLock().notifyAll();
}
- if(_onSaslCompleteTask != null)
+ if (_onSaslCompleteTask != null)
{
_onSaslCompleteTask.run();
}
@@ -776,19 +778,32 @@ public class ConnectionEndpoint implemen
public void receiveSaslMechanisms(final SaslMechanisms saslMechanisms)
{
- if(Arrays.asList(saslMechanisms.getSaslServerMechanisms()).contains(Symbol.valueOf("PLAIN")))
+ SaslInit init = new SaslInit();
+ init.setHostname(_remoteHostname);
+
+ Set<Symbol> mechanisms = new HashSet<Symbol>(Arrays.asList(saslMechanisms.getSaslServerMechanisms()));
+ if (mechanisms.contains(SASL_PLAIN) && _password != null)
{
- SaslInit init = new SaslInit();
- init.setMechanism(Symbol.valueOf("PLAIN"));
- init.setHostname(_remoteHostname);
+
+ init.setMechanism(SASL_PLAIN);
+
byte[] usernameBytes = _user.getName().getBytes(Charset.forName("UTF-8"));
byte[] passwordBytes = _password.getBytes(Charset.forName("UTF-8"));
- byte[] initResponse = new byte[usernameBytes.length+passwordBytes.length+2];
- System.arraycopy(usernameBytes,0,initResponse,1,usernameBytes.length);
- System.arraycopy(passwordBytes,0,initResponse,usernameBytes.length+2,passwordBytes.length);
+ byte[] initResponse = new byte[usernameBytes.length + passwordBytes.length + 2];
+ System.arraycopy(usernameBytes, 0, initResponse, 1, usernameBytes.length);
+ System.arraycopy(passwordBytes, 0, initResponse, usernameBytes.length + 2, passwordBytes.length);
init.setInitialResponse(new Binary(initResponse));
- _saslFrameOutput.send(new SASLFrame(init),null);
+
}
+ else if (mechanisms.contains(SASL_ANONYMOUS))
+ {
+ init.setMechanism(SASL_ANONYMOUS);
+ }
+ else if (mechanisms.contains(SASL_EXTERNAL))
+ {
+ init.setMechanism(SASL_EXTERNAL);
+ }
+ _saslFrameOutput.send(new SASLFrame(init), null);
}
public void receiveSaslChallenge(final SaslChallenge saslChallenge)
@@ -798,65 +813,66 @@ public class ConnectionEndpoint implemen
public void receiveSaslResponse(final SaslResponse saslResponse)
{
- final Binary responseBinary = saslResponse.getResponse();
- byte[] response = responseBinary == null ? new byte[0] : responseBinary.getArray();
-
+ final Binary responseBinary = saslResponse.getResponse();
+ byte[] response = responseBinary == null ? new byte[0] : responseBinary.getArray();
- try
- {
- // Process response from the client
- byte[] challenge = _saslServer.evaluateResponse(response != null ? response : new byte[0]);
-
- if (_saslServer.isComplete())
- {
- SaslOutcome outcome = new SaslOutcome();
+ try
+ {
- outcome.setCode(SaslCode.OK);
- _saslFrameOutput.send(new SASLFrame(outcome),null);
- synchronized (getLock())
- {
- _saslComplete = true;
- _authenticated = true;
- getLock().notifyAll();
- }
- if(_onSaslCompleteTask != null)
- {
- _onSaslCompleteTask.run();
- }
+ // Process response from the client
+ byte[] challenge = _saslServer.evaluateResponse(response != null ? response : new byte[0]);
- }
- else
- {
- SaslChallenge challengeBody = new SaslChallenge();
- challengeBody.setChallenge(new Binary(challenge));
- _saslFrameOutput.send(new SASLFrame(challengeBody), null);
+ if (_saslServer.isComplete())
+ {
+ SaslOutcome outcome = new SaslOutcome();
- }
+ outcome.setCode(SaslCode.OK);
+ _saslFrameOutput.send(new SASLFrame(outcome), null);
+ synchronized (getLock())
+ {
+ _saslComplete = true;
+ _authenticated = true;
+ _user = _saslServerProvider.getAuthenticatedPrincipal(_saslServer);
+ getLock().notifyAll();
}
- catch (SaslException e)
+ if (_onSaslCompleteTask != null)
{
- SaslOutcome outcome = new SaslOutcome();
+ _onSaslCompleteTask.run();
+ }
- outcome.setCode(SaslCode.AUTH);
- _saslFrameOutput.send(new SASLFrame(outcome),null);
- synchronized (getLock())
- {
- _saslComplete = true;
- _authenticated = false;
- getLock().notifyAll();
- }
- if(_onSaslCompleteTask != null)
- {
- _onSaslCompleteTask.run();
- }
+ }
+ else
+ {
+ SaslChallenge challengeBody = new SaslChallenge();
+ challengeBody.setChallenge(new Binary(challenge));
+ _saslFrameOutput.send(new SASLFrame(challengeBody), null);
- }
+ }
}
+ catch (SaslException e)
+ {
+ SaslOutcome outcome = new SaslOutcome();
+
+ outcome.setCode(SaslCode.AUTH);
+ _saslFrameOutput.send(new SASLFrame(outcome), null);
+ synchronized (getLock())
+ {
+ _saslComplete = true;
+ _authenticated = false;
+ getLock().notifyAll();
+ }
+ if (_onSaslCompleteTask != null)
+ {
+ _onSaslCompleteTask.run();
+ }
+
+ }
+ }
public void receiveSaslOutcome(final SaslOutcome saslOutcome)
{
- if(saslOutcome.getCode() == SaslCode.OK)
+ if (saslOutcome.getCode() == SaslCode.OK)
{
_saslFrameOutput.close();
synchronized (getLock())
@@ -865,7 +881,7 @@ public class ConnectionEndpoint implemen
_authenticated = true;
getLock().notifyAll();
}
- if(_onSaslCompleteTask != null)
+ if (_onSaslCompleteTask != null)
{
_onSaslCompleteTask.run();
}
@@ -904,22 +920,13 @@ public class ConnectionEndpoint implemen
return _authenticated;
}
- public void initiateSASL()
+ public void initiateSASL(String[] mechanismNames)
{
SaslMechanisms mechanisms = new SaslMechanisms();
- final Enumeration<SaslServerFactory> saslServerFactories = Sasl.getSaslServerFactories();
-
- SaslServerFactory f;
ArrayList<Symbol> mechanismsList = new ArrayList<Symbol>();
- while(saslServerFactories.hasMoreElements())
+ for (String name : mechanismNames)
{
- f = saslServerFactories.nextElement();
- final String[] mechanismNames = f.getMechanismNames(null);
- for(String name : mechanismNames)
- {
- mechanismsList.add(Symbol.valueOf(name));
- }
-
+ mechanismsList.add(Symbol.valueOf(name));
}
mechanisms.setSaslServerMechanisms(mechanismsList.toArray(new Symbol[mechanismsList.size()]));
_saslFrameOutput.send(new SASLFrame(mechanisms), null);
Modified: qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java?rev=1471141&r1=1471140&r2=1471141&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java (original)
+++ qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java Tue Apr 23 20:54:19 2013
@@ -20,10 +20,12 @@
package org.apache.qpid.amqp_1_0.transport;
+import java.security.Principal;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
public interface SaslServerProvider
{
SaslServer getSaslServer(String mechanism, String fqdn) throws SaslException;
+ Principal getAuthenticatedPrincipal(SaslServer server);
}
Propchange: qpid/branches/QPID-4659/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1463061,1465459,1465590,1466482,1467334,1467922,1467930,1467932,1467938,1467940,1467992,1468815-1468816,1468830,1468875,1468953,1469256,1469914,1469916-1469917,1469937,1470439,1470454,1470457,1470463,1470474,1470897,1470899,1471004
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java?rev=1471141&r1=1471140&r2=1471141&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java Tue Apr 23 20:54:19 2013
@@ -29,6 +29,7 @@ import javax.security.auth.Subject;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang.ObjectUtils;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.AccessControl;
@@ -44,6 +45,7 @@ public class DefaultAccessControl implem
private static final Logger _logger = Logger.getLogger(DefaultAccessControl.class);
private RuleSet _ruleSet;
+ private File _aclFile;
public DefaultAccessControl(String fileName)
{
@@ -51,10 +53,8 @@ public class DefaultAccessControl implem
{
_logger.debug("Creating AccessControl instance using file: " + fileName);
}
- File aclFile = new File(fileName);
- ConfigurationFile configFile = new PlainConfiguration(aclFile);
- _ruleSet = configFile.load();
+ _aclFile = new File(fileName);
}
DefaultAccessControl(RuleSet rs) throws ConfigurationException
@@ -62,6 +62,45 @@ public class DefaultAccessControl implem
_ruleSet = rs;
}
+ public void open()
+ {
+ if(_aclFile != null)
+ {
+ if (!_aclFile.exists())
+ {
+ throw new IllegalConfigurationException("ACL file '" + _aclFile + "' is not found");
+ }
+
+ ConfigurationFile configFile = new PlainConfiguration(_aclFile);
+ _ruleSet = configFile.load();
+ }
+ }
+
+ @Override
+ public void close()
+ {
+ //no-op
+ }
+
+ @Override
+ public void onDelete()
+ {
+ //no-op
+ }
+
+ @Override
+ public void onCreate()
+ {
+ //verify file exists
+ if(_aclFile != null)
+ {
+ if (!_aclFile.exists())
+ {
+ throw new IllegalConfigurationException("ACL file '" + _aclFile + "' is not found");
+ }
+ }
+ }
+
public Result getDefault()
{
return _ruleSet.getDefault();
@@ -119,4 +158,5 @@ public class DefaultAccessControl implem
return Result.DENIED;
}
}
+
}
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java?rev=1471141&r1=1471140&r2=1471141&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java Tue Apr 23 20:54:19 2013
@@ -20,40 +20,60 @@
*/
package org.apache.qpid.server.security.access.plugins;
-import java.io.File;
+import static org.apache.qpid.server.security.access.FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE;
+import static org.apache.qpid.server.security.access.FileAccessControlProviderConstants.PATH;
+import static org.apache.qpid.server.util.MapValueConverter.getStringAttribute;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.plugin.AccessControlFactory;
import org.apache.qpid.server.security.AccessControl;
+import org.apache.qpid.server.util.ResourceBundleLoader;
public class DefaultAccessControlFactory implements AccessControlFactory
{
- public static final String ATTRIBUTE_ACL_FILE = "aclFile";
+ public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.access.plugins.FileAccessControlProviderAttributeDescriptions";
+
+ public static final Collection<String> ATTRIBUTES = Collections.<String> unmodifiableList(Arrays.asList(
+ ATTRIBUTE_TYPE,
+ PATH
+ ));
- public AccessControl createInstance(Map<String, Object> aclConfiguration)
+ public AccessControl createInstance(Map<String, Object> attributes)
{
- if (aclConfiguration != null)
+ if(attributes == null || !ACL_FILE_PROVIDER_TYPE.equals(attributes.get(ATTRIBUTE_TYPE)))
+ {
+ return null;
+ }
+
+ String path = getStringAttribute(PATH, attributes, null);
+ if (path == null || "".equals(path.trim()))
{
- Object aclFile = aclConfiguration.get(ATTRIBUTE_ACL_FILE);
- if (aclFile != null)
- {
- if (aclFile instanceof String)
- {
- String aclPath = (String) aclFile;
- if (!new File(aclPath).exists())
- {
- throw new IllegalConfigurationException("ACL file '" + aclPath + "' is not found");
- }
- return new DefaultAccessControl(aclPath);
- }
- else
- {
- throw new IllegalConfigurationException("Expected '" + ATTRIBUTE_ACL_FILE + "' attribute value of type String but was " + aclFile.getClass()
- + ": " + aclFile);
- }
- }
+ throw new IllegalConfigurationException("Path to ACL was not specified!");
}
- return null;
+
+ return new DefaultAccessControl(path);
+ }
+
+ @Override
+ public String getType()
+ {
+ return ACL_FILE_PROVIDER_TYPE;
+ }
+
+ @Override
+ public Collection<String> getAttributeNames()
+ {
+ return ATTRIBUTES;
+ }
+
+ @Override
+ public Map<String, String> getAttributeDescriptions()
+ {
+ return ResourceBundleLoader.getResources(RESOURCE_BUNDLE);
}
}
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java?rev=1471141&r1=1471140&r2=1471141&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java Tue Apr 23 20:54:19 2013
@@ -6,7 +6,9 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.security.AccessControl;
+import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
@@ -25,8 +27,10 @@ public class DefaultAccessControlFactory
File aclFile = TestFileUtils.createTempFile(this, ".acl", "ACL ALLOW all all");
DefaultAccessControlFactory factory = new DefaultAccessControlFactory();
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(DefaultAccessControlFactory.ATTRIBUTE_ACL_FILE, aclFile.getAbsolutePath());
+ attributes.put(GroupProvider.TYPE, FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(FileAccessControlProviderConstants.PATH, aclFile.getAbsolutePath());
AccessControl acl = factory.createInstance(attributes);
+ acl.open();
assertNotNull("ACL was not created from acl file: " + aclFile.getAbsolutePath(), acl);
}
@@ -37,33 +41,17 @@ public class DefaultAccessControlFactory
assertFalse("ACL file " + aclFile.getAbsolutePath() + " actually exists but should not", aclFile.exists());
DefaultAccessControlFactory factory = new DefaultAccessControlFactory();
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(DefaultAccessControlFactory.ATTRIBUTE_ACL_FILE, aclFile.getAbsolutePath());
+ attributes.put(GroupProvider.TYPE, FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(FileAccessControlProviderConstants.PATH, aclFile.getAbsolutePath());
try
{
- factory.createInstance(attributes);
- fail("It should not be possible to create ACL from non existing file");
+ AccessControl control = factory.createInstance(attributes);
+ control.open();
+ fail("It should not be possible to create and initialise ACL with non existing file");
}
catch (IllegalConfigurationException e)
{
- assertTrue("Unexpected exception message", Pattern.matches("ACL file '.*' is not found", e.getMessage()));
- }
- }
-
- public void testCreateInstanceWhenAclFileIsSpecifiedAsNonString()
- {
- DefaultAccessControlFactory factory = new DefaultAccessControlFactory();
- Map<String, Object> attributes = new HashMap<String, Object>();
- Integer aclFile = new Integer(0);
- attributes.put(DefaultAccessControlFactory.ATTRIBUTE_ACL_FILE, aclFile);
- try
- {
- factory.createInstance(attributes);
- fail("It should not be possible to create ACL from Integer");
- }
- catch (IllegalConfigurationException e)
- {
- assertEquals("Unexpected exception message", "Expected '" + DefaultAccessControlFactory.ATTRIBUTE_ACL_FILE
- + "' attribute value of type String but was " + Integer.class + ": " + aclFile, e.getMessage());
+ assertTrue("Unexpected exception message: " + e.getMessage(), Pattern.matches("ACL file '.*' is not found", e.getMessage()));
}
}
}
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1471141&r1=1471140&r2=1471141&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Tue Apr 23 20:54:19 2013
@@ -22,8 +22,10 @@ package org.apache.qpid.server.managemen
import java.io.File;
import java.lang.reflect.Type;
+import java.net.SocketAddress;
import java.util.Collection;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -33,9 +35,10 @@ import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
+import org.apache.qpid.server.management.plugin.filter.ForbiddingAuthorisationFilter;
+import org.apache.qpid.server.management.plugin.filter.RedirectingAuthorisationFilter;
import org.apache.qpid.server.management.plugin.servlet.DefinedFileServlet;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
-import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.HelperServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.LogRecordsServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.LogoutServlet;
@@ -44,6 +47,7 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.StructureServlet;
+import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Broker;
@@ -60,21 +64,25 @@ import org.apache.qpid.server.model.Prot
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.Session;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.AbstractPluginAdapter;
import org.apache.qpid.server.plugin.PluginFactory;
+import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.util.MapValueConverter;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.DispatcherType;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-public class HttpManagement extends AbstractPluginAdapter
+public class HttpManagement extends AbstractPluginAdapter implements HttpManagementConfiguration
{
private final Logger _logger = Logger.getLogger(HttpManagement.class);
@@ -105,8 +113,6 @@ public class HttpManagement extends Abst
add(PluginFactory.PLUGIN_TYPE);
}});
- public static final String ENTRY_POINT_PATH = "/management";
-
private static final String OPERATIONAL_LOGGING_NAME = "Web";
@@ -238,7 +244,7 @@ public class HttpManagement extends Abst
}
else if (protocols.contains(Protocol.HTTPS))
{
- KeyStore keyStore = _broker.getDefaultKeyStore();
+ KeyStore keyStore = port.getKeyStore();
if (keyStore == null)
{
throw new IllegalConfigurationException("Key store is not configured. Cannot start management on HTTPS port without keystore");
@@ -266,12 +272,19 @@ public class HttpManagement extends Abst
server.setHandler(root);
// set servlet context attributes for broker and configuration
- root.getServletContext().setAttribute(AbstractServlet.ATTR_BROKER, _broker);
- root.getServletContext().setAttribute(AbstractServlet.ATTR_MANAGEMENT, this);
+ root.getServletContext().setAttribute(HttpManagementUtil.ATTR_BROKER, _broker);
+ root.getServletContext().setAttribute(HttpManagementUtil.ATTR_MANAGEMENT_CONFIGURATION, this);
+
+ FilterHolder restAuthorizationFilter = new FilterHolder(new ForbiddingAuthorisationFilter());
+ restAuthorizationFilter.setInitParameter(ForbiddingAuthorisationFilter.INIT_PARAM_ALLOWED, "/rest/sasl");
+ root.addFilter(restAuthorizationFilter, "/rest/*", EnumSet.of(DispatcherType.REQUEST));
+ root.addFilter(new FilterHolder(new RedirectingAuthorisationFilter()), HttpManagementUtil.ENTRY_POINT_PATH, EnumSet.of(DispatcherType.REQUEST));
+ root.addFilter(new FilterHolder(new RedirectingAuthorisationFilter()), "/index.html", EnumSet.of(DispatcherType.REQUEST));
addRestServlet(root, "broker");
addRestServlet(root, "virtualhost", VirtualHost.class);
addRestServlet(root, "authenticationprovider", AuthenticationProvider.class);
+ addRestServlet(root, "accesscontrolprovider", AccessControlProvider.class);
addRestServlet(root, "user", AuthenticationProvider.class, User.class);
addRestServlet(root, "groupprovider", GroupProvider.class);
addRestServlet(root, "group", GroupProvider.class, Group.class);
@@ -282,6 +295,8 @@ public class HttpManagement extends Abst
addRestServlet(root, "binding", VirtualHost.class, Exchange.class, Queue.class, Binding.class);
addRestServlet(root, "port", Port.class);
addRestServlet(root, "session", VirtualHost.class, Connection.class, Session.class);
+ addRestServlet(root, "keystore", KeyStore.class);
+ addRestServlet(root, "truststore", TrustStore.class);
root.addServlet(new ServletHolder(new StructureServlet()), "/rest/structure");
root.addServlet(new ServletHolder(new MessageServlet()), "/rest/message/*");
@@ -291,7 +306,7 @@ public class HttpManagement extends Abst
root.addServlet(new ServletHolder(new SaslServlet()), "/rest/sasl");
- root.addServlet(new ServletHolder(new DefinedFileServlet("index.html")), ENTRY_POINT_PATH);
+ root.addServlet(new ServletHolder(new DefinedFileServlet("index.html")), HttpManagementUtil.ENTRY_POINT_PATH);
root.addServlet(new ServletHolder(new LogoutServlet()), "/logout");
root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.js");
@@ -396,24 +411,34 @@ public class HttpManagement extends Abst
return Collections.unmodifiableCollection(AVAILABLE_ATTRIBUTES);
}
+ @Override
public boolean isHttpsSaslAuthenticationEnabled()
{
return (Boolean)getAttribute(HTTPS_SASL_AUTHENTICATION_ENABLED);
}
+ @Override
public boolean isHttpSaslAuthenticationEnabled()
{
return (Boolean)getAttribute(HTTP_SASL_AUTHENTICATION_ENABLED);
}
+ @Override
public boolean isHttpsBasicAuthenticationEnabled()
{
return (Boolean)getAttribute(HTTPS_BASIC_AUTHENTICATION_ENABLED);
}
+ @Override
public boolean isHttpBasicAuthenticationEnabled()
{
return (Boolean)getAttribute(HTTP_BASIC_AUTHENTICATION_ENABLED);
}
+ @Override
+ public SubjectCreator getSubjectCreator(SocketAddress localAddress)
+ {
+ return _broker.getSubjectCreator(localAddress);
+ }
+
}
Copied: qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (from r1465590, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java?p2=qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java&p1=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java&r1=1465590&r2=1471141&rev=1471141&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java Tue Apr 23 20:54:19 2013
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.management.plugin;
+import java.net.SocketAddress;
+
+import org.apache.qpid.server.security.SubjectCreator;
+
public interface HttpManagementConfiguration
{
boolean isHttpsSaslAuthenticationEnabled();
@@ -29,4 +33,6 @@ public interface HttpManagementConfigura
boolean isHttpsBasicAuthenticationEnabled();
boolean isHttpBasicAuthenticationEnabled();
+
+ SubjectCreator getSubjectCreator(SocketAddress localAddress);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org