23034195 Update RabbitMQ to 3.6.1 s11u3-sru
authorDrew Fisher <drew.fisher@oracle.com>
Thu, 14 Apr 2016 14:58:30 -0700
branchs11u3-sru
changeset 6124 0a6b764b6ad6
parent 6100 fdf1b74e1ca5
child 6126 4c9442ffa570
23034195 Update RabbitMQ to 3.6.1 23034207 problem in SERVICE/RABBITMQ
components/rabbitmq/Makefile
components/rabbitmq/files/rmq-mplex
components/rabbitmq/files/svc-rabbitmq
components/rabbitmq/patches/env.patch
components/rabbitmq/patches/makefile.patch
components/rabbitmq/rabbitmq.license
components/rabbitmq/rabbitmq.p5m
components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/02-params.patch
--- a/components/rabbitmq/Makefile	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/Makefile	Thu Apr 14 14:58:30 2016 -0700
@@ -28,16 +28,16 @@
 PATH=/usr/gnu/bin:/usr/bin:/usr/sbin
 
 COMPONENT_NAME=		rabbitmq-server
-COMPONENT_VERSION=	3.5.6
+COMPONENT_VERSION=	3.6.1
 COMPONENT_PROJECT_URL=	http://www.rabbitmq.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:24be1433234112db391e0c5ef32bfb2ca111e51b2e57998cc0f3d97ba361671f
+    sha256:c696134e863f99191a301288c12d69ff00b7e648107ee52c8686ae047dde1bee
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/releases/$(COMPONENT_NAME)/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	service/rabbitmq
 
-TPNO=			25764
+TPNO=			27775
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
@@ -45,13 +45,22 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+PKG_PROTO_DIRS +=	$(COMPONENT_DIR)/files
 
-PKG_PROTO_DIRS += $(BUILD_DIR)/$(MACH32)
+# rabbitmq doesn't like cloney
+COMPONENT_PRE_BUILD_ACTION = ($(CP) -rp $(SOURCE_DIR)/. $(@D))
+
+COMPONENT_BUILD_ACTION +=	/usr/bin/true
 
-COMPONENT_INSTALL_ENV +=	TARGET_DIR=$(PROTO_DIR)
-COMPONENT_INSTALL_ENV +=	SBIN_DIR=$(PROTO_DIR)/usr/sbin
-COMPONENT_INSTALL_ENV +=	MAN_DIR=$(PROTO_DIR)/usr/share/man
+COMPONENT_INSTALL_TARGETS =	all
+COMPONENT_INSTALL_TARGETS +=	install
+COMPONENT_INSTALL_TARGETS +=	install-man
+COMPONENT_INSTALL_ENV +=	DESTDIR=$(PROTO_DIR)
+COMPONENT_INSTALL_ENV +=	MANDIR=/usr/share/man
+COMPONENT_INSTALL_ENV +=	RMQ_ROOTDIR=/usr
+COMPONENT_INSTALL_ENV +=	RMQ_BINDIR=/usr/lib/rabbitmq/bin
+COMPONENT_INSTALL_ENV +=	RMQ_LIBDIR=/usr/lib
+COMPONENT_INSTALL_ENV +=	RMQ_ERLAPP_DIR=/usr/lib/rabbitmq
 
 # We delegate the running of the tests to a script because it's easier to find
 # and use unique free ports in a single process, and it's easier to make sure
@@ -60,18 +69,21 @@
 COMPONENT_TEST_CMD =		$(PYTHON)
 COMPONENT_TEST_TARGETS =	test.py $(TEST_32)
 
+# taken from justmake.mk but with the CLONEY line removed.
+# build the configured source
+$(BUILD_DIR)/%/.built:  $(SOURCE_DIR)/.prep
+	$(RM) -r $(@D) ; $(MKDIR) $(@D)
+	$(COMPONENT_PRE_BUILD_ACTION)
+	($(COMPONENT_BUILD_ACTION))
+	$(COMPONENT_POST_BUILD_ACTION)
+
 # common targets
-build:		$(BUILD_32)
-
 install:	$(INSTALL_32)
 
 test:		$(TEST_32)
 
 
-PKG_PROTO_DIRS +=	$(COMPONENT_DIR)/files
-
 REQUIRED_PACKAGES += compress/zip
 REQUIRED_PACKAGES += runtime/erlang
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
-
--- a/components/rabbitmq/files/rmq-mplex	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/files/rmq-mplex	Thu Apr 14 14:58:30 2016 -0700
@@ -19,8 +19,8 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 export HOME=/var/lib/rabbitmq
-exec /usr/lib/rabbitmq/bin/${0##*/} "[email protected]"
+exec /usr/lib/rabbitmq/sbin/${0##*/} "[email protected]"
--- a/components/rabbitmq/files/svc-rabbitmq	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/files/svc-rabbitmq	Thu Apr 14 14:58:30 2016 -0700
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 . /lib/svc/share/smf_include.sh
@@ -45,8 +45,8 @@
 		print $r
 	else
 		print $(
-			SCRIPT_DIR=/usr/lib/rabbitmq/bin;
-			. /usr/lib/rabbitmq/bin/rabbitmq-env;
+			RABBITMQ_SCRIPTS_DIR=/usr/lib/rabbitmq/sbin;
+			. /usr/lib/rabbitmq/sbin/rabbitmq-env;
 			eval print \${$1}
 		)
 	fi
--- a/components/rabbitmq/patches/env.patch	Wed Jun 01 13:54:12 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-This allows us to source rabbitmq-env from a script that doesn't live in
-the same directory.
-
---- rabbitmq-server-2.8.7/scripts/rabbitmq-env	Thu Sep 27 04:08:40 2012
-+++ rabbitmq-server-2.8.7/scripts/rabbitmq-env	Mon Nov  5 11:10:09 2012
[email protected]@ -32,7 +32,7 @@
-     fi
- done
- 
--SCRIPT_DIR=`dirname $SCRIPT_PATH`
-+SCRIPT_DIR=${SCRIPT_DIR:-`dirname $SCRIPT_PATH`}
- RABBITMQ_HOME="${SCRIPT_DIR}/.."
- [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
- [email protected]${HOSTNAME%%.*}
--- a/components/rabbitmq/patches/makefile.patch	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/patches/makefile.patch	Thu Apr 14 14:58:30 2016 -0700
@@ -1,32 +1,24 @@
 In-house patch to use supported sed flags and to remove gzipping of man pages
 
---- rabbitmq-server-3.5.6/Makefile.orig  2015-11-09 11:32:32.297343560 -0700
-+++ rabbitmq-server-3.5.6/Makefile    2015-11-09 11:33:27.169056719 -0700
[email protected]@ -75,7 +75,7 @@ $(shell awk 'BEGIN {
- }')
- endef
+--- rabbitmq-server-3.6.1/Makefile.orig  2016-03-31 14:49:40.661997085 -0700
++++ rabbitmq-server-3.6.1/Makefile    2016-03-31 14:55:24.094181414 -0700
[email protected]@ -82,7 +82,7 @@ ifdef CREDIT_FLOW_TRACING
+ RMQ_ERLC_OPTS += -DCREDIT_FLOW_TRACING=true
+ endif
 
--ERTS_VER = $(shell erl -version 2>&1 | sed -E 's/.* version //')
-+ERTS_VER = $(shell erl -version 2>&1 | sed -e 's/.* version //')
+-ERTS_VER := $(shell erl -version 2>&1 | sed -E 's/.* version //')
++ERTS_VER := $(shell erl -version 2>&1 | sed -e 's/.* version //')
  USE_SPECS_MIN_ERTS_VER = 5.11
  ifeq ($(call compare_version,$(ERTS_VER),$(USE_SPECS_MIN_ERTS_VER),>=),true)
- ERLC_OPTS += -Duse_specs
[email protected]@ -348,8 +348,7 @@ distclean: clean
- %.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
-	xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || opt='--stringparam man.indent.verbatims=0' ; \
-	    xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
--	    xmlto -o $(DOCS_DIR) $$opt man $<.tmp && \
--	    gzip -f $(DOCS_DIR)/`basename $< .xml`
-+	    xmlto -o $(DOCS_DIR) $$opt man $<.tmp
-	rm -f $<.tmp
+ RMQ_ERLC_OPTS += -Duse_specs
[email protected]@ -391,8 +391,8 @@ install-man: manpages
+ 	for section in $$sections; do \
+ 		mkdir -p $(DESTDIR)$(MANDIR)/man$$section; \
+ 		for manpage in $(DOCS_DIR)/*.$$section; do \
+-			gzip < $$manpage \
+-			 > $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage).gz; \
++			cp $$manpage \
++			 $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage); \
+ 		done; \
+ 	done
 
- # Use tmp files rather than a pipeline so that we get meaningful errors
[email protected]@ -393,7 +392,7 @@ install_bin: all install_dirs
- install_docs: docs_all install_dirs
-	for section in 1 5; do \
-		mkdir -p $(MAN_DIR)/man$$section; \
--		for manpage in $(DOCS_DIR)/*.$$section.gz; do \
-+		for manpage in $(DOCS_DIR)/*.$$section; do \
-			cp $$manpage $(MAN_DIR)/man$$section; \
-		done; \
-	done
--- a/components/rabbitmq/rabbitmq.license	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/rabbitmq.license	Thu Apr 14 14:58:30 2016 -0700
@@ -4,7 +4,7 @@
 [email protected]
 
 The files amqp-rabbitmq-0.8.json and amqp-rabbitmq-0.9.1.json are
-"Copyright (C) 2008-2013 GoPivotal", Inc. and are covered by the MIT
+"Copyright (C) 2008-2016 Pivotal Software, Inc", Inc. and are covered by the MIT
 license.
 
 jQuery is "Copyright (c) 2010 John Resig" and is covered by the MIT
@@ -24,16 +24,6 @@
 Flot is "Copyright (c) 2007-2013 IOLA and Ole Laursen" and is covered
 by the MIT license. It was downloaded from
 http://www.flotcharts.org/
-Webmachine is Copyright (c) Basho Technologies and is covered by the
-Apache License 2.0.  It was downloaded from http://webmachine.basho.com/
-
-Eldap is "Copyright (c) 2010, Torbjorn Tornkvist" and is covered by
-the MIT license.  It was downloaded from https://github.com/etnt/eldap
-
-Mochiweb is "Copyright (c) 2007 Mochi Media, Inc." and is covered by
-the MIT license.  It was downloaded from
-http://github.com/mochi/mochiweb/
-
 glMatrix is "Copyright (c) 2011, Brandon Jones" and is covered by the
 BSD 2-Clause license.  It was downloaded from
 http://code.google.com/p/glmatrix/
@@ -554,853 +544,3 @@
      the notices in the Source Code files of the Original Code. You should
      use the text of this Exhibit A rather than the text found in the
      Original Code Source Code for Your Modifications.]
-
---------------------------------------------------------------------------
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed 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.
-
---------------------------------------------------------------------------
-
- Copyright (c) 2010 Nick Galbreath
- http://code.google.com/p/stringencoders/source/browse/#svn/trunk/javascript
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-Copyright (c) 2011, Brandon Jones
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------
-
-EJS - Embedded JavaScript
-
-Copyright (c) 2007 Edward Benson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-Copyright (c) 2010, Torbjorn Tornkvist
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-Copyright (c) 2007-2013 IOLA and Ole Laursen
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-Copyright (c) 2011 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-This is the MIT license.
-
-Copyright (c) 2007 Mochi Media, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-Copyright (c) 2008 Aaron Quint, Quirkey NYC, LLC
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is RabbitMQ.
-
-     The Initial Developer of the Original Code is GoPivotal, Inc.
-     Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.''
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-----
--- a/components/rabbitmq/rabbitmq.p5m	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/rabbitmq.p5m	Thu Apr 14 14:58:30 2016 -0700
@@ -20,15 +20,10 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform path=usr/lib/rabbitmq/bin/(.*) -> set action.hash sbin/%<1>>
-<transform path=usr/lib/rabbitmq/ebin/(.*) -> set action.hash ebin/%<1>>
-<transform path=usr/lib/rabbitmq/include/(.*) -> set action.hash include/%<1>>
-<transform path=usr/lib/rabbitmq/plugins/(.*) -> set action.hash plugins/%<1>>
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
-#
 set name=pkg.fmri \
     value=pkg:/network/amqp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A message broker implementing AMQP"
@@ -53,62 +48,39 @@
 file files/rmq-mplex path=usr/bin/rabbitmq-plugins
 link path=usr/bin/rabbitmq-server target=rabbitmq-plugins
 link path=usr/bin/rabbitmqctl target=rabbitmq-plugins
-file path=usr/lib/rabbitmq/bin/rabbitmq-defaults
-file path=usr/lib/rabbitmq/bin/rabbitmq-env
-file path=usr/lib/rabbitmq/bin/rabbitmq-plugins
-file path=usr/lib/rabbitmq/bin/rabbitmq-server
-file path=usr/lib/rabbitmq/bin/rabbitmqctl
-file path=usr/lib/rabbitmq/ebin/app_utils.beam
 file path=usr/lib/rabbitmq/ebin/background_gc.beam
-file path=usr/lib/rabbitmq/ebin/credit_flow.beam
 file path=usr/lib/rabbitmq/ebin/delegate.beam
 file path=usr/lib/rabbitmq/ebin/delegate_sup.beam
 file path=usr/lib/rabbitmq/ebin/dtree.beam
 file path=usr/lib/rabbitmq/ebin/file_handle_cache.beam
 file path=usr/lib/rabbitmq/ebin/file_handle_cache_stats.beam
 file path=usr/lib/rabbitmq/ebin/gatherer.beam
-file path=usr/lib/rabbitmq/ebin/gen_server2.beam
 file path=usr/lib/rabbitmq/ebin/gm.beam
 file path=usr/lib/rabbitmq/ebin/lqueue.beam
-file path=usr/lib/rabbitmq/ebin/mirrored_supervisor.beam
 file path=usr/lib/rabbitmq/ebin/mirrored_supervisor_sups.beam
 file path=usr/lib/rabbitmq/ebin/mnesia_sync.beam
-file path=usr/lib/rabbitmq/ebin/mochijson2.beam
 file path=usr/lib/rabbitmq/ebin/mochinum.beam
 file path=usr/lib/rabbitmq/ebin/pg2_fixed.beam
 file path=usr/lib/rabbitmq/ebin/pg_local.beam
-file path=usr/lib/rabbitmq/ebin/pmon.beam
-file path=usr/lib/rabbitmq/ebin/priority_queue.beam
 file path=usr/lib/rabbitmq/ebin/rabbit.app
 file path=usr/lib/rabbitmq/ebin/rabbit.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_access_control.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_alarm.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue_process.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue_sup_sup.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_app.in
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_backend_dummy.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_backend_internal.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism_amqplain.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism_cr_demo.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism_plain.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_authn_backend.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_authz_backend.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_autoheal.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_backing_queue.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_basic.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_binary_generator.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_binary_parser.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_binding.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_channel.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_channel_interceptor.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_boot_steps.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_channel_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_channel_sup_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_cli.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_client_sup.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_command_assembler.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_connection_helper_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_connection_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_control_main.beam
@@ -120,10 +92,8 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_epmd_monitor.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_error_logger.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_error_logger_file_h.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_event.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_exchange_decorator.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_exchange_parameters.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_direct.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_fanout.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_headers.beam
@@ -131,10 +101,8 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_topic.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_file.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_framing.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_framing_amqp_0_8.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_framing_amqp_0_9_1.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_guid.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_heartbeat.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_hipe.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_limiter.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_log.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_memory_monitor.beam
@@ -147,38 +115,38 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_mirror_queue_mode_nodes.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mirror_queue_slave.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mirror_queue_sync.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_misc.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mnesia.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mnesia_rename.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_file.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_store.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_store_ets_index.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_store_gc.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_msg_store_index.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_net.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_networking.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_node_monitor.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_nodes.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_parameter_validation.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password_hashing_md5.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password_hashing_sha256.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password_hashing_sha512.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_plugins.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_plugins_main.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_plugins_usage.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_policies.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_policy.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_policy_validator.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_prelaunch.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_prequeue.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_priority_queue.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_queue_collector.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_queue_consumers.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_queue_decorator.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_queue_index.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_reader.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_client_local.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_min_masters.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_random.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_validator.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_master_location_misc.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_recovery_terms.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_registry.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_resource_monitor_misc.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_restartable_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_router.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_runtime_parameter.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_runtime_parameters.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_sasl_report_file_h.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_ssl.beam
@@ -192,15 +160,9 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_version.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_vhost.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_vm.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_writer.beam
-file path=usr/lib/rabbitmq/ebin/ssl_compat.beam
 file path=usr/lib/rabbitmq/ebin/supervised_lifecycle.beam
-file path=usr/lib/rabbitmq/ebin/supervisor2.beam
-file path=usr/lib/rabbitmq/ebin/tcp_acceptor.beam
-file path=usr/lib/rabbitmq/ebin/tcp_acceptor_sup.beam
 file path=usr/lib/rabbitmq/ebin/tcp_listener.beam
 file path=usr/lib/rabbitmq/ebin/tcp_listener_sup.beam
-file path=usr/lib/rabbitmq/ebin/time_compat.beam
 file path=usr/lib/rabbitmq/ebin/truncate.beam
 file path=usr/lib/rabbitmq/ebin/vm_memory_monitor.beam
 file path=usr/lib/rabbitmq/ebin/worker_pool.beam
@@ -213,29 +175,38 @@
 file path=usr/lib/rabbitmq/include/rabbit_msg_store.hrl
 file path=usr/lib/rabbitmq/plugins/README
 file path=usr/lib/rabbitmq/plugins/amqp_client-$(COMPONENT_VERSION).ez
-file path=usr/lib/rabbitmq/plugins/cowboy-0.5.0-rmq$(COMPONENT_VERSION)-git4b93c2d.ez
-file path=usr/lib/rabbitmq/plugins/eldap-$(COMPONENT_VERSION)-gite309de4.ez
-file path=usr/lib/rabbitmq/plugins/mochiweb-2.7.0-rmq$(COMPONENT_VERSION)-git680dba8.ez
+file path=usr/lib/rabbitmq/plugins/cowboy-1.0.3.ez
+file path=usr/lib/rabbitmq/plugins/cowlib-1.0.1.ez
+file path=usr/lib/rabbitmq/plugins/mochiweb-2.13.0.ez
+file path=usr/lib/rabbitmq/plugins/rabbit_common-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_amqp1_0-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_auth_backend_ldap-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_auth_mechanism_ssl-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-$(COMPONENT_VERSION).ez
+file path=usr/lib/rabbitmq/plugins/rabbitmq_event_exchange-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_federation-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_federation_management-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_management-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_management_agent-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_management_visualiser-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_mqtt-$(COMPONENT_VERSION).ez
+file path=usr/lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-1.2.1.ez
+file path=usr/lib/rabbitmq/plugins/rabbitmq_sharding-0.1.0.ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_shovel-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_shovel_management-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_stomp-$(COMPONENT_VERSION).ez
-file path=usr/lib/rabbitmq/plugins/rabbitmq_test-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_tracing-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_web_dispatch-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_web_stomp-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_web_stomp_examples-$(COMPONENT_VERSION).ez
-file path=usr/lib/rabbitmq/plugins/sockjs-0.3.4-rmq$(COMPONENT_VERSION)-git3132eb9.ez
-file path=usr/lib/rabbitmq/plugins/webmachine-1.10.3-rmq$(COMPONENT_VERSION)-gite9359c7.ez
+file path=usr/lib/rabbitmq/plugins/ranch-1.2.1.ez
+file path=usr/lib/rabbitmq/plugins/sockjs-0.3.4.ez
+file path=usr/lib/rabbitmq/plugins/webmachine-1.10.3.ez
+file path=usr/lib/rabbitmq/sbin/rabbitmq-defaults
+file path=usr/lib/rabbitmq/sbin/rabbitmq-env
+file path=usr/lib/rabbitmq/sbin/rabbitmq-plugins
+file path=usr/lib/rabbitmq/sbin/rabbitmq-server
+file path=usr/lib/rabbitmq/sbin/rabbitmqctl
 file path=usr/share/man/man1/rabbitmq-plugins.1
 file path=usr/share/man/man1/rabbitmq-server.1
 file path=usr/share/man/man1/rabbitmqctl.1
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/02-params.patch	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/02-params.patch	Thu Apr 14 14:58:30 2016 -0700
@@ -12,7 +12,7 @@
 +      $package_name     = 'network/amqp/rabbitmq'
 +      $service_name     = 'application/rabbitmq:default'
 +      $package_provider = 'pkg'
-+      $version          = '3.5.6'
++      $version          = '3.6.1'
 +      $rabbitmq_user    = 'rabbitmq'
 +      $rabbitmq_group   = 'daemon'
 +      $rabbitmq_home    = '/var/lib/rabbitmq'