Merged revisions 537015-537026 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r537015 | tomasr | 2007-05-10 17:16:49 -0500 (Thu, 10 May 2007) | 1 line
  
  QPID-435: Fix HeadersExchangeTest
........
  r537019 | tomasr | 2007-05-10 17:25:01 -0500 (Thu, 10 May 2007) | 1 line
  
  QPID-441 Fix handling of bounced messages
........
  r537026 | tomasr | 2007-05-10 17:46:46 -0500 (Thu, 10 May 2007) | 1 line
  
  QPID-398 SSL support for .NET client
........


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

6 files changed, 113 insertions, 3 deletions

diff --git a/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
new file mode 100644
index 0000000000..2220c3152a
--- /dev/null
+++ b/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
@@ -0,0 +1,46 @@
+/*

+ *

+ * 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.

+ *

+ */

+

+using System;

+using System.Runtime.Serialization;

+

+using Qpid.Protocol;

+

+namespace Qpid

+{

+   /// <summary>

+   /// Thrown when an invalid argument was supplied to the broker

+   /// </summary>

+   [Serializable]

+   public class AMQInvalidArgumentException : AMQException

+   {

+      public AMQInvalidArgumentException(string message)

+         : base(AMQConstant.INVALID_ARGUMENT.Code, message, null)

+      {

+      }

+

+      protected AMQInvalidArgumentException(SerializationInfo info, StreamingContext ctxt)

+         : base(info, ctxt)

+      {

+      }

+

+   }

+}

diff --git a/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
new file mode 100644
index 0000000000..962211de04
--- /dev/null
+++ b/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
@@ -0,0 +1,46 @@
+/*

+ *

+ * 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.

+ *

+ */

+

+using System;

+using System.Runtime.Serialization;

+

+using Qpid.Protocol;

+

+namespace Qpid

+{

+   /// <summary>

+   /// Thrown when an invalid routing key was sent to the broker

+   /// </summary>

+   [Serializable]

+   public class AMQInvalidRoutingKeyException : AMQException

+   {

+      public AMQInvalidRoutingKeyException(string message)

+         : base(AMQConstant.INVALID_ROUTING_KEY.Code, message, null)

+      {

+      }

+

+      protected AMQInvalidRoutingKeyException(SerializationInfo info, StreamingContext ctxt)

+         : base(info, ctxt)

+      {

+      }

+

+   }

+}

diff --git a/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/dotnet/Qpid.Common/Protocol/AMQConstant.cs
index 560ac97122..04b4011567 100644
--- a/dotnet/Qpid.Common/Protocol/AMQConstant.cs
+++ b/dotnet/Qpid.Common/Protocol/AMQConstant.cs
@@ -77,11 +77,14 @@ namespace Qpid.Protocol
       public static readonly AMQConstant NO_ROUTE = new AMQConstant(312, "no route", true);

       public static readonly AMQConstant NO_CONSUMERS = new AMQConstant(313, "no consumers", true);

       public static readonly AMQConstant CONTEXT_IN_USE = new AMQConstant(320, "context in use", true);

-      public static readonly AMQConstant CONTEXT_UNKNOWN = new AMQConstant(321, "context unknown", true);

-      public static readonly AMQConstant INVALID_SELECTOR = new AMQConstant(322, "selector invalid", true);

       public static readonly AMQConstant INVALID_PATH = new AMQConstant(402, "invalid path", true);

       public static readonly AMQConstant ACCESS_REFUSED = new AMQConstant(403, "access refused", true);

       public static readonly AMQConstant NOT_FOUND = new AMQConstant(404, "not found", true);

+      public static readonly AMQConstant ALREADY_EXISTS = new AMQConstant(405, "already exists", true);

+      public static readonly AMQConstant IN_USE = new AMQConstant(406, "in use", true);

+      public static readonly AMQConstant INVALID_ROUTING_KEY = new AMQConstant(407, "routing key invalid", true);

+      public static readonly AMQConstant REQUEST_TIMEOUT = new AMQConstant(408, "request timeout", true);

+      public static readonly AMQConstant INVALID_ARGUMENT = new AMQConstant(409, "argument invalid", true);

       public static readonly AMQConstant FRAME_ERROR = new AMQConstant(501, "frame error", true);

       public static readonly AMQConstant SYNTAX_ERROR = new AMQConstant(502, "syntax error", true);

       public static readonly AMQConstant COMMAND_INVALID = new AMQConstant(503, "command invalid", true);

diff --git a/dotnet/Qpid.Common/Qpid.Common.csproj b/dotnet/Qpid.Common/Qpid.Common.csproj
index ec85567a25..944fe24677 100644
--- a/dotnet/Qpid.Common/Qpid.Common.csproj
+++ b/dotnet/Qpid.Common/Qpid.Common.csproj
@@ -44,6 +44,8 @@
     <Compile Include="AMQConnectionClosedException.cs" />

     <Compile Include="AMQDisconnectedException.cs" />

     <Compile Include="AMQException.cs" />

+    <Compile Include="AMQInvalidArgumentException.cs" />

+    <Compile Include="AMQInvalidRoutingKeyException.cs" />

     <Compile Include="AMQUndeliveredException.cs" />

     <Compile Include="AssemblySettings.cs" />

     <Compile Include="Collections\LinkedHashtable.cs" />

@@ -208,4 +210,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>

+</Project>
\ No newline at end of file
diff --git a/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll b/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
new file mode 100644
index 0000000000..c3b95d71ba
--- /dev/null
+++ b/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
diff --git a/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt b/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
new file mode 100644
index 0000000000..e837183135
--- /dev/null
+++ b/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
@@ -0,0 +1,13 @@
+Source Code License

+

+Copyright © 2002-2006, The Mentalis.org Team

+All rights reserved.

+http://www.mentalis.org/

+

+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+

+- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

+

+- Neither the name of the Mentalis.org Team, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.