Skip to content

Commit

Permalink
Merge bug24606
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon MacMullen committed Feb 3, 2012
2 parents f0da4b1 + 563b8a0 commit 8fa608c
Show file tree
Hide file tree
Showing 259 changed files with 543 additions and 542 deletions.
2 changes: 1 addition & 1 deletion LICENSE-MPL-RabbitMQ
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ EXHIBIT A -Mozilla Public License.
The Original Code is RabbitMQ.

The Initial Developer of the Original Code is VMware, Inc.
Copyright (c) 2007-2011 VMware, Inc. All rights reserved.''
Copyright (c) 2007-2012 VMware, 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
Expand Down
4 changes: 2 additions & 2 deletions dist-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## The APL v2.0:
##
##---------------------------------------------------------------------------
## Copyright (C) 2007-2011 VMware, Inc.
## Copyright (C) 2007-2012 VMware, Inc.
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,7 +37,7 @@
## The Original Code is RabbitMQ.
##
## The Initial Developer of the Original Code is VMware, Inc.
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
##---------------------------------------------------------------------------

function assembly-version {
Expand Down
4 changes: 2 additions & 2 deletions dist-msi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## The APL v2.0:
##
##---------------------------------------------------------------------------
## Copyright (C) 2007-2011 VMware, Inc.
## Copyright (C) 2007-2012 VMware, Inc.
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,7 +37,7 @@
## The Original Code is RabbitMQ.
##
## The Initial Developer of the Original Code is VMware, Inc.
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
##---------------------------------------------------------------------------

### Fail on any non-zero return
Expand Down
4 changes: 2 additions & 2 deletions dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## The APL v2.0:
##
##---------------------------------------------------------------------------
## Copyright (C) 2007-2011 VMware, Inc.
## Copyright (C) 2007-2012 VMware, Inc.
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,7 +37,7 @@
## The Original Code is RabbitMQ.
##
## The Initial Developer of the Original Code is VMware, Inc.
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
##---------------------------------------------------------------------------

### Fail on any non-zero return
Expand Down
6 changes: 3 additions & 3 deletions docs/api-title-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h1>RabbitMQ .NET client library API guide</h1>
<h2>Copyright</h2>
<p>
This documentation is copyright (C) 2007-2011 VMware, Inc.
This documentation is copyright (C) 2007-2012 VMware, Inc.
</p>
<h2>License</h2>
<p>
Expand All @@ -18,7 +18,7 @@ <h2>License</h2>
</p>
<blockquote>
<p>
Copyright (C) 2007-2011 VMware, Inc.
Copyright (C) 2007-2012 VMware, Inc.
</p>
<p>
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -57,7 +57,7 @@ <h2>License</h2>
</p>
<p>
The Initial Developer of the Original Code is VMware, Inc.
Copyright (c) 2007-2011 VMware, Inc. All Rights Reserved.
Copyright (c) 2007-2012 VMware, Inc. All Rights Reserved.
</p>
</blockquote>
</body>
Expand Down
2 changes: 1 addition & 1 deletion docs/extractdocbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
## The Original Code is RabbitMQ.
##
## The Initial Developer of the Original Code is VMware, Inc.
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
##

from __future__ import nested_scopes
Expand Down
5 changes: 3 additions & 2 deletions docs/user-guide-skeleton.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<year>2009</year>
<year>2010</year>
<year>2011</year>
<year>2012</year>
<holder> VMware, Inc.</holder>
</copyright>
<legalnotice>
Expand All @@ -22,7 +23,7 @@
</para>
<blockquote>
<para>
Copyright (C) 2007-2011 VMware, Inc.
Copyright (C) 2007-2012 VMware, Inc.
</para>
<para>
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -61,7 +62,7 @@
</para>
<para>
The Initial Developer of the Original Code is VMware, Inc.
Copyright (c) 2007-2011 VMware, Inc. All Rights Reserved.
Copyright (c) 2007-2012 VMware, Inc. All Rights Reserved.
</para>
</blockquote>

Expand Down
6 changes: 3 additions & 3 deletions projects/client/Apigen/properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System.Reflection;
Expand All @@ -50,7 +50,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("VMware, Inc.")]
[assembly: AssemblyProduct("ApiGen")]
[assembly: AssemblyCopyright("Copyright © 2007-2011 VMware, Inc.")]
[assembly: AssemblyCopyright("Copyright © 2007-2012 VMware, Inc.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
4 changes: 2 additions & 2 deletions projects/client/Apigen/src/apigen/AmqpClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
4 changes: 2 additions & 2 deletions projects/client/Apigen/src/apigen/AmqpEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
4 changes: 2 additions & 2 deletions projects/client/Apigen/src/apigen/AmqpField.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
4 changes: 2 additions & 2 deletions projects/client/Apigen/src/apigen/AmqpMethod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
8 changes: 4 additions & 4 deletions projects/client/Apigen/src/apigen/Apigen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down Expand Up @@ -359,7 +359,7 @@ public void EmitPrelude() {
EmitLine("// The APL v2.0:");
EmitLine("//");
EmitLine("//---------------------------------------------------------------------------");
EmitLine("// Copyright (C) 2007-2011 VMware, Inc.");
EmitLine("// Copyright (C) 2007-2012 VMware, Inc.");
EmitLine("//");
EmitLine("// Licensed under the Apache License, Version 2.0 (the \"License\");");
EmitLine("// you may not use this file except in compliance with the License.");
Expand Down Expand Up @@ -390,7 +390,7 @@ public void EmitPrelude() {
EmitLine("// The Original Code is RabbitMQ.");
EmitLine("//");
EmitLine("// The Initial Developer of the Original Code is VMware, Inc.");
EmitLine("// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.");
EmitLine("// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.");
EmitLine("//---------------------------------------------------------------------------");
EmitLine("");
EmitLine("using RabbitMQ.Client;");
Expand Down
6 changes: 3 additions & 3 deletions projects/client/ApigenBootstrap/properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System.Reflection;
Expand All @@ -50,7 +50,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("VMware, Inc.")]
[assembly: AssemblyProduct("ApiGenBootstrap")]
[assembly: AssemblyCopyright("Copyright © 2007-2011 VMware, Inc.")]
[assembly: AssemblyCopyright("Copyright © 2007-2012 VMware, Inc.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
4 changes: 2 additions & 2 deletions projects/client/RabbitMQ.Client/src/client/api/AmqpVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The APL v2.0:
//
//---------------------------------------------------------------------------
// Copyright (C) 2007-2011 VMware, Inc.
// Copyright (C) 2007-2012 VMware, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,7 @@
// The Original Code is RabbitMQ.
//
// The Initial Developer of the Original Code is VMware, Inc.
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
//---------------------------------------------------------------------------

namespace RabbitMQ.Client
Expand Down
Loading

0 comments on commit 8fa608c

Please sign in to comment.