merge bug26130 into default

Author: michaelklishin

.hgignore

@@ -5,6 +5,9 @@ syntax: regexp
 rabbit\.snk$
 ^rabbit\-mock\.snk$
 
+^tmp/
+^Backup/
+
 ^scratch$
 ^release/
 ^build$
@@ -13,6 +16,10 @@ rabbit\.snk$
 ^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
 ^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
 
+^docs/pyle\.(log|pid)
+^docs/pyle2.*/.*\.pyc
+^docs/api-guide.pdf
+
 ^wix/dotnet-client-merge-module\.wxs$
 ^wix/dotnet-client-product\.wxs$
 ^wix/License\.rtf$
@@ -27,7 +34,6 @@ rabbit\.snk$
 ^projects/.*/.*\.csproj\.user$
 TestResult\.xml$
 
-^docs/pyle\.log$
 ^build/
 
 ~$

Dist-dotnet-2.0.props.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PropTargetFramework>v3.0</PropTargetFramework>
+    <PropTargetFramework>v3.5</PropTargetFramework>
     <PropUsingMono>@USINGMONO@</PropUsingMono>
     <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono </PropLaunchExe>
     <PropBuildWcf Condition="'$(PropUsingMono)' != 'true'">true</PropBuildWcf>

Dist-dotnet-3.0.props.in renamed to Dist-dotnet-3.5.props.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PropTargetFramework>v3.0</PropTargetFramework>
+    <PropTargetFramework>v3.5</PropTargetFramework>
     <PropAssemblyVersion>0.0.0.0</PropAssemblyVersion>
     <PropUsingMono>false</PropUsingMono>
 
@@ -10,10 +10,13 @@
 
     <!-- Program to prepend to commands when launching .exe files (note the trailing space) -->
     <!-- (do not worry about this under Windows, just set PropUsingMono to false) -->
-    <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono </PropLaunchExe>
+    <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono --debug </PropLaunchExe>
 
-    <!-- WCF component only for Windows, .NET 3.0 or higher -->
-    <PropBuildWcf Condition="'$(PropUsingMono)' != 'true' And ('$(PropTargetFramework)' == 'v3.0' Or '$(PropTargetFramework)' == 'v3.5' Or '$(PropTargetFramework)' == 'v4.0')">true</PropBuildWcf>
+    <!-- WCF component only for Windows, .NET 3.5 or higher -->
+    <PropBuildWcf Condition="'$(PropUsingMono)' != 'true' And ('$(PropTargetFramework)' == 'v3.5' Or '$(PropTargetFramework)' == 'v4.0' Or '$(PropTargetFramework)' == 'v4.5'))">true</PropBuildWcf>
+
+    <!-- Uncomment to run a single test case with /t:RunSingleUnitTest -->
+    <!-- <PropTestToRun>RabbitMQ.Client.Unit.TestConnectionRecovery</PropTestToRun> -->
   </PropertyGroup>
 </Project>
 

Local.props.example

@@ -32,7 +32,6 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}-api-guide.pdf
 	file ${RELEASE_DIR}/${NAME_VSN}-user-guide.pdf
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-service-model.pdf
-	file ${RELEASE_DIR}/${NAME_VSN}-dotnet-2.0.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc
 	file ${RELEASE_DIR}/${NAME_VSN}-dotnet-3.0.zip

Makefile

@@ -107,29 +107,9 @@ function dist-zips {
     ### Source dist
     src-dist
 
-    ### .NET 2.0 library (bin) and examples (src and bin) dist
-    dist-target-framework dotnet-2.0
-    ### HTML documentation for the .NET 2.0 library dist
-    gendoc-dist \
-        build/bin/RabbitMQ.Client.xml \
-        $NAME_VSN-client-htmldoc.zip \
-        "/suppress:RabbitMQ.Client.Framing.v0_8 \
-         /suppress:RabbitMQ.Client.Framing.v0_8qpid \
-         /suppress:RabbitMQ.Client.Framing.v0_9 \
-         /suppress:RabbitMQ.Client.Framing.v0_9_1 \
-         /suppress:RabbitMQ.Client.Framing.Impl.v0_8 \
-         /suppress:RabbitMQ.Client.Framing.Impl.v0_8qpid \
-         /suppress:RabbitMQ.Client.Framing.Impl.v0_9 \
-         /suppress:RabbitMQ.Client.Framing.Impl.v0_9_1 \
-         /suppress:RabbitMQ.Client.Impl \
-         /suppress:RabbitMQ.Client.Apigen.Attributes" \
-        $NAME_VSN-tmp-xmldoc.zip \
-        projects/client/RabbitMQ.Client \
-        ../../..
-
-    ### .NET 3.0 library (bin), examples (src and bin), WCF bindings library (bin)
+    ### .NET 3.5 library (bin), examples (src and bin), WCF bindings library (bin)
     ### and WCF examples (src) dist (WCF built only if MONO_DIST is undefined)
-    dist-target-framework dotnet-3.0
+    dist-target-framework dotnet-3.5
     if [ -z "$MONO_DIST" ]; then
         ### HTML documentation for the WCF bindings library dist
         gendoc-dist \

dist.sh

@@ -2,6 +2,7 @@ BUILDDIR=$(CURDIR)/../build
 DOCDIR=$(BUILDDIR)/doc
 MANDIR=$(BUILDDIR)/doc/userguide
 TMPDIR=$(BUILDDIR)/doc/tmp
+PYLEDIR=pyle2-fcfcf7e
 BASEURL=http://localhost:8080
 
 PAGES=UserGuide ApiOverview MessagingPatterns ShutdownProtocols TroubleShooting Examples BuildingTheClient ImplementationGuide ApiGen
@@ -12,11 +13,11 @@ DB2PDF_OPTIONS=\
 	-V %generate-article-toc% \
 	-V %generate-article-titlepage-on-separate-page%
 
-all: delete-unpacked-pyle unpack-pyle start-pyle
+all: prepare-pyle stop-pyle start-pyle
 	OK=true && \
 	{ make targets || OK=false; } && \
 	cat pyle.log && \
-	make delete-unpacked-pyle && \
+	make stop-pyle && \
 	$$OK
 
 bundle:
@@ -48,15 +49,11 @@ $(MANDIR)/%.pdf: %-skeleton.xml
 	(cd $(TMPDIR); db2pdf $(DB2PDF_OPTIONS) $*.xml)
 	mv $(TMPDIR)/$*.pdf $(MANDIR)
 
-unpack-pyle:
-	unzip -q ../tools/pyle2-snapshot-20080107.zip
-	cp pyle2-config.py pyle2-snapshot-20080107/Config.py
-
-delete-unpacked-pyle: stop-pyle
-	rm -rf pyle2-snapshot-20080107/
+prepare-pyle:
+	cp pyle2-config.py $(PYLEDIR)/Config.py
 
 start-pyle: stop-pyle
-	( cd pyle2-snapshot-20080107; make run >../pyle.log 2>&1 & echo $$! > ../pyle.pid )
+	( cd $(PYLEDIR); make run >../pyle.log 2>&1 & echo $$! > ../pyle.pid )
 	sleep 5
 
 stop-pyle:

docs/Makefile

@@ -11,31 +11,11 @@
 	from the AMQP XML specification files.
       </summary>
     </member>
-    <member name="N:RabbitMQ.Client.Framing.Impl.v0_8">
-      <summary>
-	Internal. Implementation code specific to AMQP version 0-8.
-      </summary>
-    </member>
-    <member name="N:RabbitMQ.Client.Framing.Impl.v0_8qpid">
-      <summary>
-	Internal. Implementation code specific to AMQP version 0-8, as modified by QPid.
-      </summary>
-    </member>
     <member name="N:RabbitMQ.Client.Framing.Impl.v0_9">
       <summary>
 	Internal. Implementation code specific to AMQP version 0-9.
       </summary>
     </member>
-    <member name="N:RabbitMQ.Client.Framing.v0_8">
-      <summary>
-	Semi-public. Interfaces specific to AMQP version 0-8.
-      </summary>
-    </member>
-    <member name="N:RabbitMQ.Client.Framing.v0_8qpid">
-      <summary>
-	Semi-public. Interfaces specific to AMQP version 0-8, as modified by QPid.
-      </summary>
-    </member>
     <member name="N:RabbitMQ.Client.Framing.v0_9">
       <summary>
 	Semi-public. Interfaces specific to AMQP version 0-9.

docs/RabbitMQ Service Model.docx

@@ -56,10 +56,11 @@
 use_canonical_base_url = True
 
 # How should Pyle authenticate users?
-user_authenticator = \
-        User.BugzillaAuthenticator(url = 'https://extra.lshift.net/bugzilla/relogin.cgi',
-                                   default_email_suffix = 'lshift.net',
-                                   success_regex = '<h1>Logged Out</h1>')
+user_authenticator = User.Anonymous()
+# user_authenticator = \
+#         User.BugzillaAuthenticator(url = 'https://extra.lshift.net/bugzilla/relogin.cgi',
+#                                    default_email_suffix = 'lshift.net',
+#                                    success_regex = '<h1>Logged Out</h1>')
 
 # A FilteringAuthenticator can be used to restrict access to a
 # particular instance to a certain subset of otherwise-valid users,

docs/namespaces.xml

@@ -0,0 +1,2 @@
+*.pyc
+Config.py