Skip to content

Commit 0e0779c

Browse files
author
Simon MacMullen
committed
Merge bug23443
2 parents dee01c9 + 28029a0 commit 0e0779c

File tree

204 files changed

+4146
-4660
lines changed

Some content is hidden

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

204 files changed

+4146
-4660
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-

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ distclean: clean
2323

2424
dist: distclean srcdist dist_all
2525

26-
dist_all: dist1.5 dist1.4 javadoc-archive
26+
dist_all: dist1.5 javadoc-archive
2727

2828
maven-bundle: distclean
2929
ant -Dimpl.version=$(VERSION) maven-bundle
@@ -32,10 +32,6 @@ dist1.5:
3232
ant -Ddist.out=build/$(PACKAGE_NAME)-bin-$(VERSION) -Dimpl.version=$(VERSION) dist
3333
$(MAKE) post-dist TARBALL_NAME=$(PACKAGE_NAME)-bin-$(VERSION)
3434

35-
dist1.4:
36-
ant -Ddist.out=build/$(PACKAGE_NAME)-java1.4bin-$(VERSION) -Dimpl.version=$(VERSION) dist1.4
37-
$(MAKE) post-dist TARBALL_NAME=$(PACKAGE_NAME)-java1.4bin-$(VERSION)
38-
3935
javadoc-archive:
4036
ant javadoc
4137
cp -Rp build/doc/api build/$(JAVADOC_ARCHIVE)

‎README-EXAMPLES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ SpammyTopicProducer - Sends lots of different topic messages over AMQP.
8282
StressPersister - Stress test for persister.
8383
TestMain - RabbitMQ server regression tests.
8484
TracerConcurrencyTest - Tests correct concurrency behaviour of RabbitMQ tracer.
85+

‎build.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
build.out=build
2-
retrotranslator=retrotranslator
32
lib.out=${build.out}/lib
43
dist.out=${build.out}/dist
54
src.generated=${build.out}/gensrc
@@ -11,7 +10,6 @@ alt.javac.target=1.6
1110
javac.out=${build.out}/classes
1211
test.javac.out=${build.out}/test/classes
1312
test.src.home=test/src
14-
java-jvm-1.4=c:/Program Files/java/j2re1.4.2_14/bin/java
1513
sibling.codegen.dir=../rabbitmq-codegen/
1614
spec.version=0.9.1
1715
bundle.out=${build.out}/bundle

‎build.xml‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -251,25 +251,6 @@
251251
</java>
252252
</target>
253253

254-
<!-- Alternate version that runs using Java 1.4 as a compatibility test -->
255-
<target name="test-main-silent-1.4" depends="dist1.4">
256-
<java fork="true" classname="${test.main}"
257-
jvm="${java-jvm-1.4}" failonerror="${haltOnFailureJava}"
258-
errorproperty="test.failure">
259-
<jvmarg value="-Xdebug"/>
260-
<jvmarg value="-Dsilent=true"/>
261-
<arg value="${broker.hostname}"/>
262-
<arg value="${broker.port}"/>
263-
<classpath>
264-
<fileset dir="${dist.out}">
265-
<include name="**/*.jar"/>
266-
</fileset>
267-
<pathelement path="${retrotranslator}/retrotranslator-runtime-1.2.1.jar"/>
268-
<pathelement path="${retrotranslator}/backport-util-concurrent-3.0.jar"/>
269-
</classpath>
270-
</java>
271-
</target>
272-
273254
<target name="test-main-silent-alt" depends="test-build-alt">
274255
<java fork="true" classname="${test.main}"
275256
failonerror="${haltOnFailureJava}" errorproperty="test.failure">
@@ -419,6 +400,7 @@
419400
tofile="${bundle.out}/amqp-client-${impl.version}.jar"/>
420401
<jar destfile="${bundle.out}/amqp-client-${impl.version}-sources.jar">
421402
<fileset dir="src"/>
403+
<fileset dir="${src.generated}"/>
422404
</jar>
423405
<jar destfile="${bundle.out}/amqp-client-${impl.version}-javadoc.jar">
424406
<fileset dir="${javadoc.out}"/>
@@ -472,36 +454,6 @@
472454
</copy>
473455
</target>
474456

475-
<!-- Build the Java1.4 version by running Retrotranslator on a copy of our jars -->
476-
<target name="dist1.4" depends="jar, test-jar">
477-
<mkdir dir="${dist.out}"/>
478-
<copy todir="${dist.out}">
479-
<fileset dir="lib">
480-
<include name="**/*.jar"/>
481-
</fileset>
482-
483-
<fileset dir="${lib.out}">
484-
<include name="**/*.jar"/>
485-
</fileset>
486-
487-
<fileset dir="scripts">
488-
<include name="**/*.sh"/>
489-
<include name="**/*.bat"/>
490-
</fileset>
491-
492-
<fileset file="${retrotranslator}/retrotranslator-runtime-1.2.1.jar"/>
493-
<fileset file="${retrotranslator}/backport-util-concurrent-3.0.jar"/>
494-
</copy>
495-
<java fork="true" jar="${retrotranslator}/retrotranslator-transformer-1.2.1.jar">
496-
<arg value="-srcjar"/>
497-
<arg value="${dist.out}/rabbitmq-client.jar"/>
498-
</java>
499-
<java fork="true" jar="${retrotranslator}/retrotranslator-transformer-1.2.1.jar">
500-
<arg value="-srcjar"/>
501-
<arg value="${dist.out}/rabbitmq-client-tests.jar"/>
502-
</java>
503-
</target>
504-
505457
<target name="clean">
506458
<delete dir="build"/>
507459
</target>

‎codegen.py‎

Lines changed: 22 additions & 52 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
@@ -99,35 +84,20 @@ def printFileHeader():
9984
print """// NOTE: This -*- java -*- source code is autogenerated from the AMQP
10085
// specification!
10186
//
102-
// The contents of this file are subject to the Mozilla Public License
103-
// Version 1.1 (the "License"); you may not use this file except in
104-
// compliance with the License. You may obtain a copy of the License at
105-
// http://www.mozilla.org/MPL/
106-
//
107-
// Software distributed under the License is distributed on an "AS IS"
108-
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
109-
// License for the specific language governing rights and limitations
110-
// under the License.
111-
//
112-
// The Original Code is RabbitMQ.
113-
//
114-
// The Initial Developers of the Original Code are LShift Ltd,
115-
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
116-
//
117-
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
118-
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
119-
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
120-
// Technologies LLC, and Rabbit Technologies Ltd.
87+
// The contents of this file are subject to the Mozilla Public License
88+
// Version 1.1 (the "License"); you may not use this file except in
89+
// compliance with the License. You may obtain a copy of the License
90+
// at http://www.mozilla.org/MPL/
12191
//
122-
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
123-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
124-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
125-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
126-
// (C) 2007-2010 Rabbit Technologies Ltd.
92+
// Software distributed under the License is distributed on an "AS IS"
93+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
94+
// the License for the specific language governing rights and
95+
// limitations under the License.
12796
//
128-
// All Rights Reserved.
97+
// The Original Code is RabbitMQ.
12998
//
130-
// Contributor(s): ______________________________________.
99+
// The Initial Developer of the Original Code is VMware, Inc.
100+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
131101
//
132102
"""
133103

‎retrotranslator/backport-util-concurrent-3.0.jar‎

-320 KB
Binary file not shown.

‎retrotranslator/retrotranslator-runtime-1.2.1.jar‎

-245 KB
Binary file not shown.

‎retrotranslator/retrotranslator-transformer-1.2.1.jar‎

-101 KB
Binary file not shown.

‎src/com/rabbitmq/client/Address.java‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
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

17+
3218
package com.rabbitmq.client;
3319

3420
/**

0 commit comments

Comments
 (0)