Skip to content

Commit 873842a

Browse files
author
Emile Joubert
committed
Merged bug23715 into default
2 parents c312c08 + f848b75 commit 873842a

File tree

252 files changed

+3936
-6997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+3936
-6997
lines changed

‎LICENSE-MPL-RabbitMQ‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -446,28 +446,10 @@ EXHIBIT A -Mozilla Public License.
446446

447447
The Original Code is RabbitMQ.
448448

449-
The Initial Developers of the Original Code are LShift Ltd,
450-
Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
451-
452-
Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
453-
Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
454-
are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
455-
Technologies LLC, and Rabbit Technologies Ltd.
456-
457-
Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
458-
Ltd. Portions created by Cohesive Financial Technologies LLC are
459-
Copyright (C) 2007-2010 Cohesive Financial Technologies
460-
LLC. Portions created by Rabbit Technologies Ltd are Copyright
461-
(C) 2007-2010 Rabbit Technologies Ltd.
462-
463-
All Rights Reserved.
464-
465-
Contributor(s): ______________________________________.''
449+
The Initial Developer of the Original Code is VMware, Inc.
450+
Copyright (c) 2007-2011 VMware, Inc. All rights reserved.''
466451

467452
[NOTE: The text of this Exhibit A may differ slightly from the text of
468453
the notices in the Source Code files of the Original Code. You should
469454
use the text of this Exhibit A rather than the text found in the
470455
Original Code Source Code for Your Modifications.]
471-
472-
473-

‎dist-msi.sh‎

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
## The APL v2.0:
77
##
88
##---------------------------------------------------------------------------
9-
## Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial
10-
## Technologies LLC., and Rabbit Technologies Ltd.
9+
## Copyright (C) 2007-2011 VMware, Inc.
1110
##
1211
## Licensed under the Apache License, Version 2.0 (the "License");
1312
## you may not use this file except in compliance with the License.
1413
## You may obtain a copy of the License at
1514
##
16-
## http://www.apache.org/licenses/LICENSE-2.0
15+
## http:##www.apache.org/licenses/LICENSE-2.0
1716
##
1817
## Unless required by applicable law or agreed to in writing, software
1918
## distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,36 +24,20 @@
2524
## The MPL v1.1:
2625
##
2726
##---------------------------------------------------------------------------
28-
## The contents of this file are subject to the Mozilla Public License
29-
## Version 1.1 (the "License"); you may not use this file except in
30-
## compliance with the License. You may obtain a copy of the License at
31-
## http://www.rabbitmq.com/mpl.html
32-
##
33-
## Software distributed under the License is distributed on an "AS IS"
34-
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
35-
## License for the specific language governing rights and limitations
36-
## under the License.
27+
## The contents of this file are subject to the Mozilla Public License
28+
## Version 1.1 (the "License"); you may not use this file except in
29+
## compliance with the License. You may obtain a copy of the License
30+
## at http:##www.mozilla.org/MPL/
3731
##
38-
## The Original Code is The RabbitMQ .NET Client.
32+
## Software distributed under the License is distributed on an "AS IS"
33+
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
34+
## the License for the specific language governing rights and
35+
## limitations under the License.
3936
##
40-
## The Initial Developers of the Original Code are LShift Ltd,
41-
## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
42-
##
43-
## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
44-
## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
45-
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
46-
## Technologies LLC, and Rabbit Technologies Ltd.
47-
##
48-
## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
49-
## Ltd. Portions created by Cohesive Financial Technologies LLC are
50-
## Copyright (C) 2007-2010 Cohesive Financial Technologies
51-
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
52-
## (C) 2007-2010 Rabbit Technologies Ltd.
53-
##
54-
## All Rights Reserved.
55-
##
56-
## Contributor(s): ______________________________________.
37+
## The Original Code is RabbitMQ.
5738
##
39+
## The Initial Developer of the Original Code is VMware, Inc.
40+
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
5841
##---------------------------------------------------------------------------
5942

6043
### Fail on any non-zero return

‎dist.sh‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
## The APL v2.0:
77
##
88
##---------------------------------------------------------------------------
9-
## Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial
10-
## Technologies LLC., and Rabbit Technologies Ltd.
9+
## Copyright (C) 2007-2011 VMware, Inc.
1110
##
1211
## Licensed under the Apache License, Version 2.0 (the "License");
1312
## you may not use this file except in compliance with the License.
1413
## You may obtain a copy of the License at
1514
##
16-
## http://www.apache.org/licenses/LICENSE-2.0
15+
## http:##www.apache.org/licenses/LICENSE-2.0
1716
##
1817
## Unless required by applicable law or agreed to in writing, software
1918
## distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,39 +24,22 @@
2524
## The MPL v1.1:
2625
##
2726
##---------------------------------------------------------------------------
28-
## The contents of this file are subject to the Mozilla Public License
29-
## Version 1.1 (the "License"); you may not use this file except in
30-
## compliance with the License. You may obtain a copy of the License at
31-
## http://www.rabbitmq.com/mpl.html
32-
##
33-
## Software distributed under the License is distributed on an "AS IS"
34-
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
35-
## License for the specific language governing rights and limitations
36-
## under the License.
27+
## The contents of this file are subject to the Mozilla Public License
28+
## Version 1.1 (the "License"); you may not use this file except in
29+
## compliance with the License. You may obtain a copy of the License
30+
## at http:##www.mozilla.org/MPL/
3731
##
38-
## The Original Code is The RabbitMQ .NET Client.
32+
## Software distributed under the License is distributed on an "AS IS"
33+
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
34+
## the License for the specific language governing rights and
35+
## limitations under the License.
3936
##
40-
## The Initial Developers of the Original Code are LShift Ltd,
41-
## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
42-
##
43-
## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
44-
## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
45-
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
46-
## Technologies LLC, and Rabbit Technologies Ltd.
47-
##
48-
## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
49-
## Ltd. Portions created by Cohesive Financial Technologies LLC are
50-
## Copyright (C) 2007-2010 Cohesive Financial Technologies
51-
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
52-
## (C) 2007-2010 Rabbit Technologies Ltd.
53-
##
54-
## All Rights Reserved.
55-
##
56-
## Contributor(s): ______________________________________.
37+
## The Original Code is RabbitMQ.
5738
##
39+
## The Initial Developer of the Original Code is VMware, Inc.
40+
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
5841
##---------------------------------------------------------------------------
5942

60-
6143
### Fail on any non-zero return
6244
set -e
6345
### Print command traces

‎docs/api-title-page.html‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
<h1>RabbitMQ .NET client library API guide</h1>
77
<h2>Copyright</h2>
88
<p>
9-
This documentation is copyright (C) 2007-2010 LShift Ltd.,
10-
Cohesive Financial Technologies LLC., and Rabbit Technologies
11-
Ltd.
9+
This documentation is copyright (C) 2007-2011 VMware, Inc.
1210
</p>
1311
<h2>License</h2>
1412
<p>
@@ -20,8 +18,7 @@ <h2>License</h2>
2018
</p>
2119
<blockquote>
2220
<p>
23-
Copyright (C) 2007-2010 LShift Ltd, Cohesive Financial Technologies
24-
LLC, and Rabbit Technologies Ltd.
21+
Copyright (C) 2007-2011 VMware, Inc.
2522
</p>
2623
<p>
2724
Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,31 +53,12 @@ <h2>License</h2>
5653
under the License.
5754
</p>
5855
<p>
59-
The Original Code is The RabbitMQ .NET Client.
56+
The Original Code is RabbitMQ.
6057
</p>
6158
<p>
62-
The Initial Developers of the Original Code are LShift Ltd, Cohesive
63-
Financial Technologies LLC, and Rabbit Technologies Ltd.
64-
</p>
65-
<p>
66-
Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
67-
Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd are
68-
Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial Technologies
69-
LLC, and Rabbit Technologies Ltd.
70-
</p>
71-
<p>
72-
Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
73-
Ltd. Portions created by Cohesive Financial Technologies LLC are
74-
Copyright (C) 2007-2010 Cohesive Financial Technologies LLC. Portions
75-
created by Rabbit Technologies Ltd are Copyright (C) 2007-2010 Rabbit
76-
Technologies Ltd.
77-
</p>
78-
<p>
79-
All Rights Reserved.
80-
</p>
81-
<p>
82-
Contributor(s): ______________________________________.
59+
The Initial Developer of the Original Code is VMware, Inc.
60+
Copyright (c) 2007-2011 VMware, Inc. All Rights Reserved.
8361
</p>
8462
</blockquote>
8563
</body>
86-
</html>
64+
</html>

‎docs/extractdocbook.py‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,17 @@
1-
## The contents of this file are subject to the Mozilla Public License
2-
## Version 1.1 (the "License"); you may not use this file except in
3-
## compliance with the License. You may obtain a copy of the License at
4-
## http://www.mozilla.org/MPL/
1+
## The contents of this file are subject to the Mozilla Public License
2+
## Version 1.1 (the "License"); you may not use this file except in
3+
## compliance with the License. You may obtain a copy of the License
4+
## at http://www.mozilla.org/MPL/
55
##
6-
## Software distributed under the License is distributed on an "AS IS"
7-
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
8-
## License for the specific language governing rights and limitations
9-
## under the License.
6+
## Software distributed under the License is distributed on an "AS IS"
7+
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
## the License for the specific language governing rights and
9+
## limitations under the License.
1010
##
11-
## The Original Code is RabbitMQ.
11+
## The Original Code is RabbitMQ.
1212
##
13-
## The Initial Developers of the Original Code are LShift Ltd,
14-
## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
15-
##
16-
## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17-
## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18-
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19-
## Technologies LLC, and Rabbit Technologies Ltd.
20-
##
21-
## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
22-
## Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
## Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
## (C) 2007-2010 Rabbit Technologies Ltd.
26-
##
27-
## All Rights Reserved.
28-
##
29-
## Contributor(s): ______________________________________.
13+
## The Initial Developer of the Original Code is VMware, Inc.
14+
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
##
3116

3217
from __future__ import nested_scopes

‎docs/user-guide-skeleton.xml‎

Lines changed: 45 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,76 +8,63 @@
88
<year>2007</year>
99
<year>2008</year>
1010
<year>2009</year>
11-
<holder> LShift Ltd.</holder>
12-
<holder> Cohesive Financial Technologies LLC.</holder>
13-
<holder> Rabbit Technologies Ltd.</holder>
11+
<year>2010</year>
12+
<year>2011</year>
13+
<holder> VMware, Inc.</holder>
1414
</copyright>
1515
<legalnotice>
1616
<para>
17-
This documentation is dual-licensed under the Apache License, version
18-
2.0, and the Mozilla Public License, version 1.1.
17+
This documentation is dual-licensed under the Apache License, version
18+
2.0, and the Mozilla Public License, version 1.1.
1919
</para>
2020
<para>
21-
The APL v2.0:
21+
The APL v2.0:
2222
</para>
2323
<blockquote>
24-
<para>
25-
Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial
26-
Technologies LLC., and Rabbit Technologies Ltd.
27-
</para>
28-
<para>
29-
Licensed under the Apache License, Version 2.0 (the "License");
30-
you may not use this file except in compliance with the License.
31-
You may obtain a copy of the License at
32-
</para>
33-
<para>
34-
http://www.apache.org/licenses/LICENSE-2.0
35-
</para>
36-
<para>
37-
Unless required by applicable law or agreed to in writing, software
38-
distributed under the License is distributed on an "AS IS" BASIS,
39-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
40-
See the License for the specific language governing permissions and
41-
limitations under the License.
42-
</para>
24+
<para>
25+
Copyright (C) 2007-2011 VMware, Inc.
26+
</para>
27+
<para>
28+
Licensed under the Apache License, Version 2.0 (the "License");
29+
you may not use this file except in compliance with the License.
30+
You may obtain a copy of the License at
31+
</para>
32+
<para>
33+
http://www.apache.org/licenses/LICENSE-2.0
34+
</para>
35+
<para>
36+
Unless required by applicable law or agreed to in writing, software
37+
distributed under the License is distributed on an "AS IS" BASIS,
38+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
39+
See the License for the specific language governing permissions and
40+
limitations under the License.
41+
</para>
4342
</blockquote>
4443
<para>
45-
The MPL v1.1:
44+
The MPL v1.1:
4645
</para>
4746
<blockquote>
48-
<para>
49-
The contents of this file are subject to the Mozilla Public License
50-
Version 1.1 (the "License"); you may not use this file except in
51-
compliance with the License. You may obtain a copy of the License at
52-
http://www.rabbitmq.com/mpl.html
53-
</para>
54-
<para>
55-
Software distributed under the License is distributed on an "AS IS"
56-
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
57-
License for the specific language governing rights and limitations
58-
under the License.
59-
</para>
60-
<para>
61-
The Original Code is The RabbitMQ .NET Client.
62-
</para>
63-
<para>
64-
The Initial Developers of the Original Code are LShift Ltd.,
65-
Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
66-
</para>
67-
<para>
68-
Portions created by LShift Ltd., Cohesive Financial Technologies
69-
LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008
70-
LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
71-
Technologies Ltd.;
72-
</para>
73-
<para>
74-
All Rights Reserved.
75-
</para>
76-
<para>
77-
Contributor(s): ______________________________________.
78-
</para>
47+
<para>
48+
The contents of this file are subject to the Mozilla Public License
49+
Version 1.1 (the "License"); you may not use this file except in
50+
compliance with the License. You may obtain a copy of the License at
51+
http://www.rabbitmq.com/mpl.html
52+
</para>
53+
<para>
54+
Software distributed under the License is distributed on an "AS IS"
55+
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
56+
License for the specific language governing rights and limitations
57+
under the License.
58+
</para>
59+
<para>
60+
The Original Code is RabbitMQ.
61+
</para>
62+
<para>
63+
The Initial Developer of the Original Code is VMware, Inc.
64+
Copyright (c) 2007-2011 VMware, Inc. All Rights Reserved.
65+
</para>
7966
</blockquote>
80-
67+
8168
</legalnotice>
8269
</articleinfo>
8370
</article>

0 commit comments

Comments
 (0)