QPID-3041 Make dist process does not package the .NET Binding source

cpp/configure.ac: 
  add tar-ustar to automake init options (name length > 99 fix)
  create a makefile in bindings/qpid/dotnet
cpp/src/Makefile.am
  add various windows-specific source files that have crept in
cpp/binding/qpid/Makefile.am
  add the dotnet directory to subdirs list
cpp/bindings/qpid/dotnet/Makefile.am
  EXTRA_DIST list of all the dotnet binding files

Requires a ./bootstrap and ./configure to take effect.



git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068944 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 135 insertions, 3 deletions

diff --git a/cpp/bindings/qpid/Makefile.am b/cpp/bindings/qpid/Makefile.am
index 07b51e6c64..ca9eda0c73 100644
--- a/cpp/bindings/qpid/Makefile.am
+++ b/cpp/bindings/qpid/Makefile.am
@@ -17,10 +17,11 @@
 # under the License.
 #
 
+SUBDIRS = dotnet
+
 if HAVE_SWIG
 
 EXTRA_DIST = qpid.i
-SUBDIRS =
 
 if HAVE_RUBY_DEVEL
 SUBDIRS += ruby
diff --git a/cpp/bindings/qpid/dotnet/Makefile.am b/cpp/bindings/qpid/dotnet/Makefile.am
new file mode 100644
index 0000000000..f2b106bcb2
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/Makefile.am
@@ -0,0 +1,125 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+EXTRA_DIST = winsdk_sources/winsdk_dotnet_examples.sln \
+  winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj \
+  winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj \
+  winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj \
+  winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj \
+  winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj \
+  winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj \
+  winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj \
+  winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj \
+  winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj \
+  winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj \
+  winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj \
+  winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj \
+  examples/csharp.direct.receiver/csharp.direct.receiver.cs \
+  examples/csharp.direct.receiver/csharp.direct.receiver.csproj \
+  examples/csharp.direct.receiver/Properties/AssemblyInfo.cs \
+  examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs \
+  examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj \
+  examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs \
+  examples/powershell.example.helloworld/powershell.example.helloworld.ps1 \
+  examples/csharp.example.helloworld/csharp.example.helloworld.cs \
+  examples/csharp.example.helloworld/csharp.example.helloworld.csproj \
+  examples/csharp.example.helloworld/Properties/AssemblyInfo.cs \
+  examples/csharp.example.declare_queues/csharp.example.declare_queues.cs \
+  examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj \
+  examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs \
+  examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj \
+  examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs \
+  examples/csharp.map.callback.sender/csharp.map.callback.sender.cs \
+  examples/csharp.example.server/csharp.example.server.csproj \
+  examples/csharp.example.server/csharp.example.server.cs \
+  examples/csharp.example.server/Properties/AssemblyInfo.cs \
+  examples/csharp.example.spout/csharp.example.spout.csproj \
+  examples/csharp.example.spout/Options.cs \
+  examples/csharp.example.spout/csharp.example.spout.cs \
+  examples/csharp.example.spout/Properties/AssemblyInfo.cs \
+  examples/csharp.example.drain/csharp.example.drain.cs \
+  examples/csharp.example.drain/csharp.example.drain.csproj \
+  examples/csharp.example.drain/Options.cs \
+  examples/csharp.example.drain/Properties/AssemblyInfo.cs \
+  examples/csharp.map.sender/csharp.map.sender.csproj \
+  examples/csharp.map.sender/csharp.map.sender.cs \
+  examples/csharp.map.sender/Properties/AssemblyInfo.cs \
+  examples/visualbasic.example.client/visualbasic.example.client.vbproj \
+  examples/visualbasic.example.client/MyProject/Resources.resx \
+  examples/visualbasic.example.client/MyProject/Application.myapp \
+  examples/visualbasic.example.client/MyProject/Settings.settings \
+  examples/visualbasic.example.client/MyProject/Settings.Designer.vb \
+  examples/visualbasic.example.client/MyProject/AssemblyInfo.vb \
+  examples/visualbasic.example.client/MyProject/Application.Designer.vb \
+  examples/visualbasic.example.client/MyProject/Resources.Designer.vb \
+  examples/visualbasic.example.client/visualbasic.example.client.vb \
+  examples/csharp.map.receiver/csharp.map.receiver.csproj \
+  examples/csharp.map.receiver/csharp.map.receiver.cs \
+  examples/csharp.map.receiver/Properties/AssemblyInfo.cs \
+  examples/csharp.example.client/csharp.example.client.cs \
+  examples/csharp.example.client/Properties/AssemblyInfo.cs \
+  examples/csharp.example.client/csharp.example.client.csproj \
+  examples/csharp.direct.sender/csharp.direct.sender.csproj \
+  examples/csharp.direct.sender/csharp.direct.sender.cs \
+  examples/csharp.direct.sender/Properties/AssemblyInfo.cs \
+  configure-windows.ps1 \
+  ReadMe.txt \
+  org.apache.qpid.messaging.sln \
+  test/messaging.test/messaging.test.address.cs \
+  test/messaging.test/messaging.test.duration.cs \
+  test/messaging.test/messaging.test.cs \
+  test/messaging.test/messaging.test.message.cs \
+  test/messaging.test/messaging.test.csproj \
+  test/messaging.test/Properties/AssemblyInfo.cs \
+  test/messaging.test/messaging.test.connection.cs \
+  src/org.apache.qpid.messaging.vcproj \
+  src/Message.cpp \
+  src/Connection.cpp \
+  src/TypeTranslator.h \
+  src/AssemblyInfo.cpp \
+  src/FailoverUpdates.h \
+  src/sessionreceiver/sessionreceiver.cs \
+  src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs \
+  src/sessionreceiver/qpid.snk \
+  src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj \
+  src/Sender.h \
+  src/TypeTranslator.cpp \
+  src/Receiver.h \
+  src/Address.h \
+  src/Sender.cpp \
+  src/QpidTypeCheck.h \
+  src/resource1.h \
+  src/Duration.h \
+  src/Session.h \
+  src/Message.h \
+  src/ReadMe.txt \
+  src/Receiver.cpp \
+  src/Address.cpp \
+  src/app.rc \
+  src/Session.cpp \
+  src/org.apache.qpid.messaging.template.rc \
+  src/qpid.snk \
+  src/Connection.h \
+  src/QpidException.h \
+  src/QpidMarshal.h \
+  src/FailoverUpdates.cpp \
+  src/Duration.cpp \
+  ../../../src/windows/resources/qpid-icon.ico \
+  ../../../src/windows/resources/template-resource.rc \
+  ../../../src/windows/resources/version-resource.h 
diff --git a/cpp/configure.ac b/cpp/configure.ac
index ee1bade1c9..ea1a1b49ea 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -16,7 +16,7 @@ AC_INIT([qpidc],
 	[dev@qpid.apache.org])
 
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects tar-ustar])
 
 # Minimum Autoconf version required.
 AC_PREREQ(2.59)
@@ -538,6 +538,7 @@ AC_CONFIG_FILES([
   bindings/qpid/ruby/Makefile
   bindings/qpid/python/Makefile
   bindings/qpid/perl/Makefile
+  bindings/qpid/dotnet/Makefile
   bindings/qmf/Makefile
   bindings/qmf/ruby/Makefile
   bindings/qmf/python/Makefile
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index e93e0c960d..cd30526675 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = . tests
 # using Visual Studio solutions/projects.
 windows_dist = \
   qpid/client/windows/SaslFactory.cpp \
+  qpid/client/windows/SslConnector.cpp \
   qpid/log/windows/SinkOptions.cpp \
   qpid/log/windows/SinkOptions.h \
   ../include/qpid/sys/windows/check.h \
@@ -42,6 +43,8 @@ windows_dist = \
   qpid/sys/windows/Shlib.cpp \
   qpid/sys/windows/SocketAddress.cpp \
   qpid/sys/windows/Socket.cpp \
+  qpid/sys/windows/SslAsynchIO.cpp \
+  qpid/sys/windows/SslAsynchIO.h \
   qpid/sys/windows/StrError.cpp \
   qpid/sys/windows/SystemInfo.cpp \
   qpid/sys/windows/Thread.cpp \
@@ -51,7 +54,9 @@ windows_dist = \
   qpid/sys/windows/uuid.h \
   windows/QpiddBroker.cpp \
   qpid/broker/windows/BrokerDefaults.cpp \
-  qpid/broker/windows/SaslAuthenticator.cpp
+  qpid/broker/windows/SaslAuthenticator.cpp \
+  qpid/broker/windows/SslProtocolFactory.cpp \
+  qpid/messaging/HandleInstantiator.cpp
 
 EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)