Author: kwall
Date: Mon Dec 28 22:49:09 2015
New Revision: 1722020
URL: http://svn.apache.org/viewvc?rev=1722020&view=rev
Log:
QPID-6961: Convert docbook build process from Make to Maven
By default docbook generation is turned off to preserve build speed. To enable
pass system property -Ddoc=true
Added:
qpid/java/trunk/doc/docbook4to5.sh
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/docbook4to5.sh
qpid/java/trunk/doc/java-broker/
qpid/java/trunk/doc/java-broker/pom.xml
qpid/java/trunk/doc/java-broker/src/
qpid/java/trunk/doc/java-broker/src/docbkx/
qpid/java/trunk/doc/java-broker/src/docbkx/AMQP-Messaging-Broker-Java-Book.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Alerts.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Backup-And-Recovery.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Concepts.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Concepts.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Exchanges-Binding-Arguments.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-High-Availability.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Installation.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Installation.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Introduction.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Channels.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Channels.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Managing-Entities.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Runtime.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Runtime.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Security.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Security.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Authentication-Providers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Authentication-Providers.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Broker.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Broker.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Exchanges.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Other-Services.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Overview.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Ports.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhosts.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml
qpid/java/trunk/doc/java-broker/src/docbkx/images/
qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-MessageFlow.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Broker-MessageFlow.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-Model.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Broker-Model.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-PortAuthFlow.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Broker-PortAuthFlow.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Direct.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Direct.svg
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Fanout.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Fanout.svg
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic.svg
qpid/java/trunk/doc/java-broker/src/docbkx/images/HA-BDBHAMessageStore-MBean-jconsole.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/HA-Create-1.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/HA-Create-1.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/HA-Create-2.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/HA-Create-2.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/HA-Create-3.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/HA-Create-3.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/HA-Overview.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/HA-Overview.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/JMX-Connect-MBeans.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/JMX-Connect-MBeans.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/JMX-Connect-Remote.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/JMX-Connect-Remote.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Add-Dialogue.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Add-Dialogue.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Auth.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Auth.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Console.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Console.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-ContextVar.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-ContextVar.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Edit-Dialogue.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Edit-Dialogue.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Logging-FileLogger.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Logging-FileLogger.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Logging-InclusionRule.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Logging-InclusionRule.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Logging-MemoryLogger.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Logging-MemoryLogger.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/Management-Web-Tab.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Management-Web-Tab.png
qpid/java/trunk/doc/java-broker/src/docbkx/images/VirtualHost-Model.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/VirtualHost-Model.png
qpid/java/trunk/doc/java-broker/src/docbkx/management/
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-HTTP.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-QMF.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-QMF.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-Web-Console.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Consumers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Consumers.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Exchanges.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Group-Providers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Group-Providers.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Keystores.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Keystores.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Ports.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Truststores.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
qpid/java/trunk/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Background-Recovery.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Background-Recovery.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Close-On-No-Route.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Close-On-No-Route.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Connection-Limit.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Connection-Limit.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Disk-Space-Management.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Disk-Space-Management.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Log-Files.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Log-Files.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Message-Compression.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Message-Compression.xml
qpid/java/trunk/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-Anonymous.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Anonymous.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-Base64MD5PasswordFile.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Base64MD5PasswordFile.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-External.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-External.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-Kerberos.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Kerberos.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-LDAP.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-LDAP.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-MD5.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-MD5.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-MD5PasswordFile.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-MD5PasswordFile.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-Plain.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Plain.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-PlainPasswordFile.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-PlainPasswordFile.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-ScramSha.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-ScramSha.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Configuration-Encryption.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Configuration-Encryption.xml
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Group-Providers.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml
qpid/java/trunk/doc/java-perftests/
qpid/java/trunk/doc/java-perftests/pom.xml
qpid/java/trunk/doc/java-perftests/src/
qpid/java/trunk/doc/java-perftests/src/docbkx/
qpid/java/trunk/doc/java-perftests/src/docbkx/JMS-Performance-Test-Framework.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/java-perftests/JMS-Performance-Test-Framework.xml
qpid/java/trunk/doc/jms-client-0-8/
qpid/java/trunk/doc/jms-client-0-8/pom.xml
qpid/java/trunk/doc/jms-client-0-8/src/
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Exceptions.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Exceptions.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Maven.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Maven.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-PooledConnectionFactory.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Appendix-PooledConnectionFactory.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Binding-URL.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Book.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Connection-URL.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Document-Scope-And-Intended-Audience.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Document-Scope-And-Intended-Audience.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Examples.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Examples.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Getting-And-Dependencies.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Introduction.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-JMS-Extensions.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-JMS-Extensions.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-JNDI-Properties-Format.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Logging.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-System-Properties.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/images/
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/images/JndiOverview.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/images/JndiOverview.png
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/images/JndiOverview.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/images/JndiOverview.svg
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/images/QpidJmsOverview.png
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/images/QpidJmsOverview.png
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/images/QpidJmsOverview.svg
- copied, changed from r1722019,
qpid/java/trunk/doc/book/src/jms-client-0-8/images/QpidJmsOverview.svg
qpid/java/trunk/doc/pom.xml
Removed:
qpid/java/trunk/doc/book/
Modified:
qpid/java/trunk/.gitignore
qpid/java/trunk/pom.xml
Modified: qpid/java/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/.gitignore?rev=1722020&r1=1722019&r2=1722020&view=diff
==============================================================================
--- qpid/java/trunk/.gitignore (original)
+++ qpid/java/trunk/.gitignore Mon Dec 28 22:49:09 2015
@@ -34,6 +34,3 @@ derby.log
*.iml
*.ipr
*.iws
-
-# docbook
-doc/book/build/
Copied: qpid/java/trunk/doc/docbook4to5.sh (from r1722019,
qpid/java/trunk/doc/book/src/docbook4to5.sh)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/docbook4to5.sh?p2=qpid/java/trunk/doc/docbook4to5.sh&p1=qpid/java/trunk/doc/book/src/docbook4to5.sh&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Added: qpid/java/trunk/doc/java-broker/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/pom.xml?rev=1722020&view=auto
==============================================================================
--- qpid/java/trunk/doc/java-broker/pom.xml (added)
+++ qpid/java/trunk/doc/java-broker/pom.xml Mon Dec 28 22:49:09 2015
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-java-doc</artifactId>
+ <version>6.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>qpid-java-doc-broker</artifactId>
+ <name>Qpid Java Broker Docbook</name>
+ <description>Qpid Java Broker Documentation</description>
+
+ <profiles>
+ <profile>
+ <id>doc</id>
+ <activation>
+ <property>
+ <name>doc</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <configuration>
+
<includes>AMQP-Messaging-Broker-Java-Book.xml</includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/AMQP-Messaging-Broker-Java-Book.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/AMQP-Messaging-Broker-Java-Book.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/AMQP-Messaging-Broker-Java-Book.xml&p1=qpid/java/trunk/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
Mon Dec 28 22:49:09 2015
@@ -47,8 +47,8 @@
absolute path. This is used to determine the location of Qpid's
dependency JARs and
some configuration files.</para>
<para>Typically the value of this variable will look similar to
- <literal>c:\qpid\&windowsExtractedBrokerDirName;</literal>
(Windows) or
-
<literal>/usr/local/qpid/&unixExtractedBrokerDirName;</literal> (Unix). The
+ <literal>c:\qpid\qpid-broker\\${project.version}</literal>
(Windows) or
+
<literal>/usr/local/qpid/qpid-broker/${project.version}</literal> (Unix). The
installation prefix will differ from installation to
installation. </para>
<para>If not set, a value for <literal>QPID_HOME</literal> is
derived from the location
of the script itself.</para>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
Mon Dec 28 22:49:09 2015
@@ -61,31 +61,31 @@ Java HotSpot(TM) 64-Bit Server VM (build
<title>Installing External JDBC Driver</title>
<para>In order to use a JDBC Virtualhost Node or a JDBC Virtualhost, you
must make the
Database's JDBC 4.0 compatible drivers available on the Broker's
classpath. To do this copy
- the driver's JAR file into the <literal>${QPID_HOME}/lib</literal>
folder.</para>
+ the driver's JAR file into the <literal>\${QPID_HOME}/lib</literal>
folder.</para>
<programlisting>Unix:
-cp <literal>driver</literal>.jar
qpid-broker-&qpidCurrentRelease;/lib</programlisting>
-
+cp <literal>driver</literal>.jar
qpid-broker-${project.version}/lib</programlisting>
+
<programlisting>Windows:
-copy <literal>driver</literal>.jar
qpid-broker-&qpidCurrentRelease;\lib</programlisting>
-
+copy <literal>driver</literal>.jar
qpid-broker-${project.version}\lib</programlisting>
</section>
+
<section role="h2"
xml:id="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE">
<title>Installing Oracle BDB JE</title>
<para> The Oracle BDB JE is not distributed with Apache Qpid owing to
license considerations.. </para>
<para>If you wish to use a BDB Virtualhost Node, BDB Virtualhost, or BDB
HA Virtualhost Node you
must make the BDB JE's JAR available on the Broker's classpath. </para>
- <para> Download the Oracle BDB JE &oracleBdbProductVersion; release <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&oracleJeDownloadUrl;">from the Oracle website.</link>
+ <para> Download the Oracle BDB JE ${bdb-version} release <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJeDownloadUrl}">from the Oracle website.</link>
</para>
- <para> The download has a name in the form
je-&oracleBdbProductVersion;.tar.gz. It is
+ <para> The download has a name in the form je-${bdb-version}.tar.gz. It is
recommended that you confirm the integrity of the download by verifying
the MD5. </para>
- <para>Copy the je-&oracleBdbProductVersion;.jar from within the release
into
- <literal>${QPID_HOME}/lib</literal> folder.</para>
+ <para>Copy the je-${bdb-version}.jar from within the release into
+ <literal>\${QPID_HOME}/lib</literal> folder.</para>
<programlisting>Unix:
-cp je-&oracleBdbProductVersion;.jar
qpid-broker-&qpidCurrentRelease;/lib</programlisting>
+cp je-${bdb-version}.jar qpid-broker-${project.version}/lib</programlisting>
<programlisting>Windows:
-copy je-&oracleBdbProductVersion;.jar
qpid-broker-&qpidCurrentRelease;\lib</programlisting>
+copy je-${bdb-version}.jar qpid-broker-${project.version}\lib</programlisting>
</section>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml
Mon Dec 28 22:49:09 2015
@@ -63,7 +63,7 @@
host. The message text itself gives us further details about the
connection: the client id, the
protocol version in used, and details of the client's qpid library.</para>
<screen>[con:8(myapp1@/127.0.0.1:52851/default)] CON-1001 : Open :
Destination : AMQP(127.0.0.1:5672) :
- Protocol Version : 0-10 : Client ID : myapp1 : Client Version :
&qpidCurrentRelease; : Client Product : qpid</screen>
+ Protocol Version : 0-10 : Client ID : myapp1 : Client Version :
${project.version} : Client Product : qpid</screen>
<para><literal><link
linkend="Java-Broker-Appendix-Operation-Logging-Message-QUE-1001">QUE-1001</link></literal>
is used when a queue is created. The connection actor
<literal>con</literal> tells us details of the connection performing the
queue creation: the
user id used by the client (myapp1), the IP, ephemeral port number and the
name of the virtual
@@ -778,7 +778,7 @@
<row>
<entry>
<para>Indicates that a connection has been unexpectedly closed by
the peer. This usually
- occurs if a machine hosting an application fails or the
application's process is
+ occurs if a machine hosting an application fails or the
application's process is
abruptly terminated.</para>
</entry>
</row>
@@ -808,7 +808,7 @@
</row>
<row>
<entry>
- <para>Indicates that a connection has been closed by the actions
of an
+ <para>Indicates that a connection has been closed by the actions
of an
Operator using manangement.</para>
</entry>
</row>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Alerts.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Alerts.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Alerts.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Backup-And-Recovery.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Backup-And-Recovery.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Backup-And-Recovery.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Backup-And-Recovery.xml
Mon Dec 28 22:49:09 2015
@@ -25,7 +25,7 @@
<section xml:id="Java-Broker-Backup-And-Recovery-Broker">
<title>Broker</title>
<para>To perform a complete backup whilst the Broker is shutdown, simply
copy all the files the
- exist beneath <literal>${QPID_WORK}</literal>, assuming all virtualhost
nodes and virtualhost
+ exist beneath <literal>\${QPID_WORK}</literal>, assuming all virtualhost
nodes and virtualhost
are in their standard location, this will copy all configuration and
persistent message data. </para>
<para>There is currently no safe mechanism to take a complete copy of the
entire Broker whilst
it is running.</para>
@@ -34,7 +34,7 @@
<title>Virtualhost Node</title>
<para>To perform a complete backup of a Virtualhost node whilst it is
stopped (or Broker down),
simply copy all the files the exist beneath
- <literal>${QPID_WORK}/<nodename>/config</literal>, assuming the
virtualhost node is in
+ <literal>\${QPID_WORK}/<nodename>/config</literal>, assuming the
virtualhost node is in
the standard location. This will copy all configuration that belongs to
that virtualhost
node.</para>
<para>The technique for backing up a virtualhost node whilst it is running
depends on its
@@ -53,16 +53,16 @@
directly</title>
<cmdsynopsis>
<command>java</command>
- <arg choice="plain">-cp qpid-bdbstore-&qpidCurrentRelease;.jar</arg>
+ <arg choice="plain">-cp qpid-bdbstore-${project.version}.jar</arg>
<arg
choice="plain">org.apache.qpid.server.store.berkeleydb.BDBBackup</arg>
<sbr/>
- <arg choice="plain">-fromdir
<replaceable>${QPID_WORK}/<nodename>/config</replaceable></arg>
+ <arg choice="plain">-fromdir
<replaceable>\${QPID_WORK}/<nodename>/config</replaceable></arg>
<arg choice="plain">-todir
<replaceable>path/to/backup/folder</replaceable></arg>
</cmdsynopsis>
</example>
<para>In the example above BDBBackup utility is called from
- qpid-bdbstore-&qpidCurrentRelease;.jar to backup the store at
- <literal>${QPID_WORK}/<nodename>/config</literal> and copy
store logs into
+ qpid-bdbstore-${project.version}.jar to backup the store at
+ <literal>\${QPID_WORK}/<nodename>/config</literal> and copy
store logs into
<literal>path/to/backup/folder</literal>.</para>
<para>Linux and Unix users can take advantage of
<literal>backup.sh</literal> bash script by
running this script in a similar way.</para>
@@ -70,7 +70,7 @@
<title>Performing store backup by using
<classname>backup.sh</classname> bash script</title>
<cmdsynopsis>
<command>backup.sh</command>
- <arg choice="plain">-fromdir
<replaceable>${QPID_WORK}/<nodename>/config</replaceable></arg>
+ <arg choice="plain">-fromdir
<replaceable>\${QPID_WORK}/<nodename>/config</replaceable></arg>
<arg choice="plain">-todir
<replaceable>path/to/backup/folder</replaceable></arg>
</cmdsynopsis>
</example>
@@ -99,14 +99,14 @@
<title>Virtualhost</title>
<para>To perform a complete backup of a Virtualhost whilst it is stopped
(or Broker down),
simply copy all the files the exist beneath
- <literal>${QPID_WORK}/<name>/messages</literal>, assuming the
virtualhost is in the
+ <literal>\${QPID_WORK}/<name>/messages</literal>, assuming the
virtualhost is in the
standard location. This will copy all messages that belongs to that
virtualhost.</para>
<para>The technique for backing up a virtualhost whilst it is running
depends on its
type.</para>
<section xml:id="Java-Broker-Backup-And-Recovery-Virtualhost-BDB">
<title>BDB</title>
<para>Use the same backup utility described above, but use the path
- <literal>${QPID_WORK}/<name>/messages</literal> instead.</para>
+ <literal>\${QPID_WORK}/<name>/messages</literal>
instead.</para>
</section>
<section xml:id="Java-Broker-Backup-And-Recovery-Virtualhost-Derby">
<title>Derby</title>
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Concepts.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Concepts.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Concepts.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Concepts.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Concepts.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Exchanges-Binding-Arguments.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Exchanges-Binding-Arguments.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Exchanges-Binding-Arguments.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Getting-Started.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Getting-Started.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
--- qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
(original)
+++ qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
Mon Dec 28 22:49:09 2015
@@ -43,7 +43,7 @@
<programlisting>bin\qpid-server.bat</programlisting>
<para>Output similar to the following will be seen:</para>
<screen>[Broker] BRK-1006 : Using configuration : C:\qpidwork\config.json
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1478262
+[Broker] BRK-1001 : Startup : Version: ${project.version} Build: 1478262
[Broker] BRK-1010 : Platform : JVM : Oracle Corporation version: 1.7.0_79-b15
OS : Windows 7 version: 6.1 arch: x86 cores: 4
[Broker] BRK-1011 : Maximum Memory : Heap : 518,979,584 bytes Direct :
1,610,612,736 bytes
[Broker] BRK-1002 : Starting : Listening on TCP port 5672
@@ -65,7 +65,7 @@
<programlisting>bin/qpid-server</programlisting>
<para>Output similar to the following will be seen:</para>
<screen>[Broker] BRK-1006 : Using configuration : /var/qpidwork/config.json
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: exported
+[Broker] BRK-1001 : Startup : Version: ${project.version} Build: exported
[Broker] BRK-1010 : Platform : JVM : Oracle Corporation version: 1.7.0_79-b15
OS : Mac OS X version: 10.10.5 arch: x86_64 cores: 4
[Broker] BRK-1011 : Maximum Memory : Heap : 518,979,584 bytes Direct :
1,610,612,736 bytes
[Broker] BRK-1002 : Starting : Listening on TCP port 5672
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-High-Availability.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-High-Availability.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
--- qpid/java/trunk/doc/book/src/java-broker/Java-Broker-High-Availability.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
Mon Dec 28 22:49:09 2015
@@ -463,7 +463,7 @@
<title>Client failover</title>
<para>As mentioned above, the clients need to be able to find the location
of the active
virtualhost within the group.</para>
- <para>Clients can do this using a static technique, for example ,
utilising the <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&qpidjmsdocClientConectionUrl;">failover feature of the Qpid
connection url</link>
+ <para>Clients can do this using a static technique, for example ,
utilising the <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBookClientConectionUrl}">failover feature of the Qpid
connection url</link>
where the client has a list of all the nodes, and tries each node in
sequence until it
discovers the node with the active virtualhost.</para>
<para>Another possibility is a dynamic technique utilising a proxy or
Virtual IP (VIP). These
@@ -524,7 +524,7 @@
<title>Resetting of replication group with
<classname>DbResetRepGroup</classname></title>
<cmdsynopsis>
<command>java</command>
- <arg choice="plain">-cp je-&oracleBdbProductVersion;.jar</arg>
+ <arg choice="plain">-cp je-${bdb-version}.jar</arg>
<arg choice="plain">com.sleepycat.je.rep.util.DbResetRepGroup</arg>
<arg choice="plain">-h
<replaceable>path/to/jelogfiles</replaceable></arg>
<sbr/>
@@ -534,7 +534,7 @@
</cmdsynopsis>
</example>
<para>The modified log files can then by copied into
- <literal>${QPID_WORK}/<nodename>/config</literal> directory of a
target Broker. Then
+ <literal>\${QPID_WORK}/<nodename>/config</literal> directory of
a target Broker. Then
start the Broker, and add a BDB HA Virtualhost node specify the same
group name, node name and
node address. You will then have a group with a single node, ready to
start re-adding
additional nodes as described above. </para>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
Mon Dec 28 22:49:09 2015
@@ -75,7 +75,7 @@
<section xml:id="Java-Broker-Initial-Configuration-Location">
<title>Configuration Store Location</title>
- <para> The broker will default to using <link
linkend="Java-Broker-Initial-Configuration-Configuration-Properties">${qpid.work_dir}</link>/config.json
as the path for its configuration store unless
+ <para> The broker will default to using <link
linkend="Java-Broker-Initial-Configuration-Configuration-Properties">\${qpid.work_dir}</link>/config.json
as the path for its configuration store unless
otherwise instructed. </para>
<para> The command line argument <emphasis>-sp</emphasis> (or
<emphasis>--store-path</emphasis>) can optionally be used to
specify a different
@@ -204,9 +204,9 @@ $ ./qpid-server -st JDBC \
<section
xml:id="Java-Broker-Initial-Configuration-Configuration-Properties">
<title>Customising Configuration using Configuration Properties</title>
<para> It is possible for 'Initial Configuration' (and Configuration
Store) files to contain
- ${properties} that can be resolved to String values at startup,
allowing a degree of
+ \${properties} that can be resolved to String values at startup,
allowing a degree of
customisation using a fixed file. Configuration Property values
can be set either via
- Java System Properties, or by specifying ConfigurationPproperties
on the broker command
+ Java System Properties, or by specifying ConfigurationProperties
on the broker command
line. If both are defined, System Property values take precedence.
</para>
<para> The broker has the following set of core configuration
properties, with the indicated
@@ -281,22 +281,22 @@ $ ./qpid-server -prop "qpid.amqp_port=10
<title>JSON 'Initial configuration' File</title>
<programlisting>
{
- "name": "${broker.name}",
+ "name": "\${broker.name}",
"modelVersion": "6.0",
"authenticationproviders" : [ {
"name" : "passwordFile",
"type" : "PlainPasswordFile",
- "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd",
+ "path" : "\${qpid.home_dir}\${file.separator}etc\${file.separator}passwd",
"preferencesproviders" : [{
"name": "fileSystemPreferences",
"type": "FileSystemPreferences",
- "path" : "${qpid.work_dir}${file.separator}user.preferences.json"
+ "path" : "\${qpid.work_dir}\${file.separator}user.preferences.json"
}]
} ],
"brokerloggers" : [ {
"name" : "logfile",
"type" : "File",
- "fileName" :
"${qpid.work_dir}${file.separator}log${file.separator}qpid.log",
+ "fileName" :
"\${qpid.work_dir}\${file.separator}log\${file.separator}qpid.log",
"brokerloginclusionrules" : [ {
"name" : "Root",
"type" : "NameAndLevel",
@@ -335,7 +335,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10
} ],
"ports" : [ {
"name" : "AMQP",
- "port" : "${qpid.amqp_port}",
+ "port" : "\${qpid.amqp_port}",
"authenticationProvider" : "passwordFile",
"virtualhostaliases" : [ {
"name" : "nameAlias",
@@ -349,7 +349,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10
} ]
}, {
"name" : "HTTP",
- "port" : "${qpid.http_port}",
+ "port" : "\${qpid.http_port}",
"authenticationProvider" : "passwordFile",
"protocols" : [ "HTTP" ]
}],
@@ -357,7 +357,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10
"name" : "default",
"type" : "JSON",
"defaultVirtualHostNode" : "true",
- "virtualHostInitialConfiguration" :
"${qpid.initial_config_virtualhost_config}"
+ "virtualHostInitialConfiguration" :
"\\\${qpid.initial_config_virtualhost_config}"
} ],
"plugins" : [ {
"type" : "MANAGEMENT-HTTP",
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Installation.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Installation.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Installation.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Installation.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Installation.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
--- qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Installation.xml
(original)
+++ qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Installation.xml Mon
Dec 28 22:49:09 2015
@@ -77,7 +77,7 @@
<title>Download</title>
<section role="h3" xml:id="Java-Broker-Installation-Download-Release">
<title>Broker Release</title>
- <para>You can download the latest Java broker package from the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&qpidDownloadUrl;">Download Page</link>. </para>
+ <para>You can download the latest Java broker package from the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidDownloadUrl}">Download Page</link>. </para>
<para> It is recommended that you confirm the integrity of the download
by verifying the PGP
signature matches that available on the site. Instructions are given
on the download page.
</para>
@@ -92,13 +92,13 @@
Qpid JARs and configuration files. It need not be the same location as
the work directory used
for the persistent message store or the log file (you will choose this
location later). For
the remainder this example we will assume that location c:\qpid has been
chosen.</para>
- <para>Next extract the &windowsBrokerDownloadFileName; package into the
directory, using either
+ <para>Next extract the qpid-broker-${project.version}-bin.zip package into
the directory, using either
the zip file handling offered by Windows (right click the file and
select 'Extract All') or a
third party tool of your choice.</para>
<para>The extraction of the broker package will have created a directory
- &windowsExtractedBrokerDirName; within c:\qpid</para>
+ qpid-broker\\${project.version} within c:\qpid</para>
<screen>
- Directory of c:\qpid\&windowsExtractedBrokerDirName;
+ Directory of c:\qpid\qpid-broker\\${project.version}
25/11/2015 11:29 <DIR> .
25/11/2015 11:29 <DIR> ..
@@ -133,13 +133,13 @@
for the persistent message store or the log file (you will choose this
location later). For
the remainder this example we will assume that location /usr/local/qpid
has been
chosen.</para>
- <para>Next extract the &unixBrokerDownloadFileName; package into the
directory.</para>
+ <para>Next extract the qpid-broker-${project.version}-bin.tgz package into
the directory.</para>
<programlisting>mkdir /usr/local/qpid
cd /usr/local/qpid
-tar xvzf &unixBrokerDownloadFileName;</programlisting>
+tar xvzf qpid-broker-${project.version}-bin.tgz</programlisting>
<para>The extraction of the broker package will have created a directory
- &unixExtractedBrokerDirName; within /usr/local/qpid</para>
- <screen>ls -la &unixExtractedBrokerDirName;/
+ qpid-broker/${project.version} within /usr/local/qpid</para>
+ <screen>ls -la qpid-broker/${project.version}/
total 56
drwxrwxr-x. 5 alex alex 4096 Nov 25 11:43 .
drwxrwxr-x. 3 alex alex 4096 Nov 25 11:43 ..
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Introduction.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Introduction.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
--- qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Introduction.xml
(original)
+++ qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml Mon
Dec 28 22:49:09 2015
@@ -26,7 +26,7 @@
<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="http://www.amqp.org";> Advanced Message Queuing Protocol
(AMQP)</link>. The Java
Broker is actually one of two message brokers provided by the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="http://qpid.apache.org";>Apache Qpid project</link>: the Java Broker
and the C++
Broker.</para>
- <para>This document relates to the Java Broker. The <link
xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&qpidCppBook;">C++
Broker is
+ <para>This document relates to the Java Broker. The <link
xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://x.y.x";>C++ Broker
is
described separately</link>.</para>
<para><emphasis>Headline features</emphasis></para>
<itemizedlist mark="circle">
@@ -68,7 +68,7 @@
<para>Client support for end to end message encryption</para>
</listitem>
<listitem>
- <para>Pluggable storage architecture with implementations including
<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="http://db.apache.org/derby/";>Apache Derby</link>, <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&oracleBdbProductOverviewUrl;">Oracle BDB JE</link><footnote>
+ <para>Pluggable storage architecture with implementations including
<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="http://db.apache.org/derby/";>Apache Derby</link>, <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleBdbProductOverviewUrl}">Oracle BDB JE</link><footnote>
<para>Oracle BDB JE must be downloaded separately.</para>
</footnote>, and External Database</para>
</listitem>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Channels.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Channels.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Channels.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Channels.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Channels.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Managing-Entities.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Managing-Entities.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Management-Managing-Entities.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Runtime.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Runtime.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Runtime.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Runtime.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Runtime.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Security.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Security.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Security.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Security.xml&p1=qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Security.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Authentication-Providers.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Authentication-Providers.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Authentication-Providers.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Authentication-Providers.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Authentication-Providers.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Broker.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Broker.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Broker.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Broker.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Broker.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Exchanges.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Exchanges.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Exchanges.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Other-Services.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Other-Services.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Other-Services.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Other-Services.xml
Mon Dec 28 22:49:09 2015
@@ -53,11 +53,11 @@
on SSL ports or making SSL connections to other external services
like LDAP, etc.</para>
<para>Truststore configuration and management is covered in <xref
linkend="Java-Broker-Management-Managing-Truststores"/>.</para>
</section>
-
+
<section xml:id="Java-Broker-Concepts-Loggers">
<title>Loggers</title>
<para><emphasis>Loggers</emphasis> are responsible for producing a log
of events from either the Broker as a whole, or
an individual Virtualhost. These are described in <xref
linkend="Java-Broker-Runtime-Logging"/>.</para>
</section>
-
+
</section>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Overview.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Overview.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Overview.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Ports.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Ports.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Ports.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
Mon Dec 28 22:49:09 2015
@@ -53,18 +53,18 @@
<section xml:id="Java-Broker-Concepts-Queues-Types-Priority">
<title>Priority</title>
<para>In a priority queue, messages on the queue are delivered in an
order determined by the
- <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#getJMSPriority()">JMS
priority message
+ <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJeeDocUrl}javax/jms/Message.html#getJMSPriority()">JMS
priority message
header</link> within the message. By default Qpid supports the 10
priority levels
mandated by JMS, with priority value 0 as the lowest priority and 9 as
the highest. </para>
<para>It is possible to reduce the effective number of priorities if
desired.</para>
- <para>JMS defines the <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#DEFAULT_PRIORITY">
+ <para>JMS defines the <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJeeDocUrl}javax/jms/Message.html#DEFAULT_PRIORITY">
default message priority</link> as 4. Messages sent without a
specified priority use this
default. </para>
</section>
<section xml:id="Java-Broker-Concepts-Queues-Types-Sorted">
<title>Sorted Queues</title>
<para>Sorted queues allow the message delivery order to be determined by
value of an arbitrary
- <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#getStringProperty()">JMS
message
+ <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJeeDocUrl}javax/jms/Message.html#getStringProperty()">JMS
message
property</link>. Sort order is alpha-numeric and the property value
must have a type
java.lang.String.</para>
<para>Messages sent to a sorted queue without the specified JMS message
property will be
@@ -74,7 +74,7 @@
<title>Last Value Queues (LVQ)</title>
<para>LVQs (or conflation queues) are special queues that automatically
discard any message
when a newer message arrives with the same key value. The key is
specified by arbitrary
- <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#getPropertyNames()">JMS
message
+ <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJeeDocUrl;javax}/jms/Message.html#getPropertyNames()">JMS
message
property</link>.</para>
<para>An example of an LVQ might be where a queue represents prices on a
stock exchange: when
you first consume from the queue you get the latest quote for each
stock, and then as new
@@ -237,7 +237,7 @@
-Dmax_prefetch=1
</programlisting>
<para> The prefetch can be also be adjusted on a per connection basis by
adding a
- <varname>maxprefetch</varname> value to the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="&qpidjmsdocClientConectionUrl;">Connection URLs</link>
+ <varname>maxprefetch</varname> value to the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBookClientConectionUrl}">Connection URLs</link>
</para>
<programlisting>
amqp://guest:guest@client1/development?maxprefetch='1'&brokerlist='tcp://localhost:5672'
@@ -248,12 +248,12 @@ amqp://guest:guest@client1/development?m
</section>
<section xml:id="Java-Broker-Concepts-Queue-EnsureNonDestructiveConsumers">
<title>Forcing all consumers to be non-destructive</title>
- <para>When a consumer attaches to a queue, the normal behaviour is that
messages are
+ <para>When a consumer attaches to a queue, the normal behaviour is that
messages are
sent to that consumer are acquired exclusively by that consumer, and
when the consumer
acknowledges them, the messages are removed from the queue.</para>
- <para>Another common pattern is to have queue "browsers" which send all
messages to the
- browser, but do not prevent other consumers from receiving the
messages, and do not
- remove them from the queue when the browser is done with them. Such
a browser is an
+ <para>Another common pattern is to have queue "browsers" which send all
messages to the
+ browser, but do not prevent other consumers from receiving the
messages, and do not
+ remove them from the queue when the browser is done with them. Such
a browser is an
instance of a "non-destructive" consumer.</para>
<para>If every consumer on a queue is non destructive then we can obtain
some interesting
behaviours. In the case of a <link
linked="Java-Broker-Concepts-Queues-Types-LVQ">LVQ
@@ -261,7 +261,7 @@ amqp://guest:guest@client1/development?m
a standard queue, if every consumer is non-destructive then we have
something that
behaves like a topic (every consumer receives every message) except
that instead of
only seeing messages that arrive after the point at which the
consumer is created, all
- messages which have not been removed due to TTL expiry (or, in the
case of LVQs,
+ messages which have not been removed due to TTL expiry (or, in the
case of LVQs,
overwirtten by newer values for the same key).</para>
<para>A queue can be created to enforce all consumers are
non-destructive. This can be
be achieved using the following queue declare argument:</para>
@@ -278,40 +278,40 @@ amqp://guest:guest@client1/development?m
<row>
<entry>qpid.ensure_nondestructive_consumers</entry>
<entry>java.lang.Boolean</entry>
- <entry>Set to true if the queue should make all consumers
attached to it behave
+ <entry>Set to true if the queue should make all consumers
attached to it behave
non-destructively. (Default is false).</entry>
</row>
</tbody>
</tgroup>
</table>
- <para>Through the <link
linkend="Java-Broker-Management-Channel-REST-API">REST</link> api,
+ <para>Through the <link
linkend="Java-Broker-Management-Channel-REST-API">REST</link> api,
the equivalent attribute is named
<varname>ensureNondestructiveConsumers</varname>.
</para>
<section>
<title>Bounding size using min/max TTL</title>
<para>For queues other than LVQs, having only non-destructive
consumers could mean that
- messages would never get deleted, leaving the queue to grow
unconstrainedly. To
+ messages would never get deleted, leaving the queue to grow
unconstrainedly. To
prevent this you can use the ability to set the maximum TTL of the
queue. To ensure
all messages have the same TTL you could also set the minimum TTL
to the same value.
</para>
<para>Minimum/Maximum TTL for a queue can be set though the HTTP
Management UI, using the
- REST API or by hand editing the configuration file (for JSON
configuration stores).
- The attribute names are <varname>minimumMessageTtl</varname> and
+ REST API or by hand editing the configuration file (for JSON
configuration stores).
+ The attribute names are <varname>minimumMessageTtl</varname> and
<varname>maximumMessageTtl</varname> and the TTL value is given in
milliseconds.</para>
</section>
<section>
<title>Choosing to receive messages based on arrival time</title>
<para>A queue with no destructive consumers will retain all messages
until they expire
- due to TTL. It may be the case that a consumer only wishes to
receive messages
- that have been sent in the last 60 minutes, and any new messages
that arrive, or
+ due to TTL. It may be the case that a consumer only wishes to
receive messages
+ that have been sent in the last 60 minutes, and any new messages
that arrive, or
alternatively it may wish only to receive newly arriving messages
and not any that
are already in the queue. This can be achieved by using a filter
on the arrival
time.</para>
<para>A special parameter <varname>x-qpid-replay-period</varname> can
be used in the
consumer declaration to control the messages the consumer wishes
to receive. The
value of <varname>x-qpid-replay-period</varname> is the time, in
seconds, for which
- the consumer wishes to see messages. A replay period of 0
indicates only newly
- arriving messages should be sent. A replay period of 3600
indicates that only
+ the consumer wishes to see messages. A replay period of 0
indicates only newly
+ arriving messages should be sent. A replay period of 3600
indicates that only
messages sent in the last hour - along with any newly arriving
messages - should be
sent.</para>
<table>
@@ -356,10 +356,6 @@ amqp://guest:guest@client1/development?m
<screen>
{ "x-qpid-replay-period" : { "x-qpid-replay-period" : [ "60" ] } }
</screen>
-
</section>
-
-
</section>
-
</section>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
---
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
Mon Dec 28 22:49:09 2015
@@ -31,6 +31,4 @@
the group. The virtualhost nodes together elect a master. When the high
availability feature is
in use, the virtualhost node has <link
linkend="Java-Broker-Concepts-RemoteReplicationNodes">remote replications
nodes</link>. There is a remote replication node corresponding to each
remote virtualhost node that form part of the group.</para>
-
-
</section>
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhosts.xml
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhosts.xml?p2=qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Virtualhosts.xml&p1=qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-MessageFlow.png (from
r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Broker-MessageFlow.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-MessageFlow.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-MessageFlow.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Broker-MessageFlow.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-Model.png
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Broker-Model.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-Model.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-Model.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Broker-Model.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-PortAuthFlow.png (from
r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Broker-PortAuthFlow.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-PortAuthFlow.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Broker-PortAuthFlow.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Broker-PortAuthFlow.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.png
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Direct.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Direct.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.svg
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Direct.svg)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.svg?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Direct.svg&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Direct.svg&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
Binary files - no diff available.
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.png
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Fanout.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Fanout.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied: qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.svg
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Fanout.svg)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.svg?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Fanout.svg&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Fanout.svg&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
Binary files - no diff available.
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.png
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.svg
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.svg?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-Hierarchical.svg&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
Binary files - no diff available.
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.png
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.png?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.png&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
(empty)
Copied:
qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.svg
(from r1722019,
qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.svg?p2=qpid/java/trunk/doc/java-broker/src/docbkx/images/Exchange-Topic-JMSSelector.svg&p1=qpid/java/trunk/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg&r1=1722019&r2=1722020&rev=1722020&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
