You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/07/31 17:54:49 UTC

svn commit: r561365 [4/10] - in /incubator/qpid/trunk/qpid: ./ cpp/ dotnet/ dotnet/Qpid.Buffer.Tests/ dotnet/Qpid.Buffer.Tests/Properties/ dotnet/Qpid.Buffer/ dotnet/Qpid.Buffer/Properties/ dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/BrokerDetai...

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs Tue Jul 31 08:53:37 2007
@@ -19,9 +19,9 @@
  *
  */
 using System;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public abstract class AMQMethodBody : IBody
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class AMQMethodBodyFactory : IBodyFactory
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     [Serializable]
     public class AMQProtocolHeaderException : AMQException

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQType.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQType.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQType.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQType.cs Tue Jul 31 08:53:37 2007
@@ -20,9 +20,9 @@
  */
 using System;
 using System.Text;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    /// <summary>
    /// Base class for the Field Table Type system.

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
 using System;
 using System.Collections;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    public sealed class AMQTypeMap
    {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs Tue Jul 31 08:53:37 2007
@@ -19,9 +19,9 @@
  *
  */
 using System;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    public class AMQTypedValue
    {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs Tue Jul 31 08:53:37 2007
@@ -20,10 +20,10 @@
  */
 using System;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Messaging;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    public class BasicContentHeaderProperties : IContentHeaderProperties
    {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs Tue Jul 31 08:53:37 2007
@@ -19,9 +19,9 @@
  *
  */
 using System.Text;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class CompositeAMQDataBlock : IDataBlock, IEncodableAMQDataBlock
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentBody : IBody
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs Tue Jul 31 08:53:37 2007
@@ -19,9 +19,9 @@
  *
  */
 using log4net;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentBodyFactory : IBodyFactory
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs Tue Jul 31 08:53:37 2007
@@ -19,9 +19,9 @@
  *
  */
 using System;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentHeaderBody : IBody
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs Tue Jul 31 08:53:37 2007
@@ -19,9 +19,9 @@
  *
  */
 using log4net;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentHeaderBodyFactory : IBodyFactory
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentHeaderPropertiesFactory
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs Tue Jul 31 08:53:37 2007
@@ -21,9 +21,9 @@
 using System;
 using System.Globalization;
 using System.Text;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    public class EncodingUtils
    {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs Tue Jul 31 08:53:37 2007
@@ -22,11 +22,11 @@
 using System.Collections;
 using System.Text;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Collections;
-using Qpid.Messaging;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Collections;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class FieldTable : IFieldTable, IEnumerable
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class HeartbeatBody : IBody
 {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class HeartbeatBodyFactory : IBodyFactory
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBody.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBody.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBody.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBody.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// An IBody is contained within a top level frame. As such, it is not en/decodable on its own but

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// Any class that is capable of turning a stream of bytes into an AMQ structure must implement this interface.

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// There will be an implementation of this interface for each content type. All content types have associated

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs Tue Jul 31 08:53:37 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// A data block represents something that has a size in bytes and the ability to write itself to a byte

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     
     /// <summary>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs Tue Jul 31 08:53:37 2007
@@ -24,12 +24,12 @@
 using System.Reflection;
 using System.Xml;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Codec;
-using Qpid.Codec.Demux;
-using Qpid.Common;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Codec.Demux;
+using Apache.Qpid.Common;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ProtocolInitiation : IDataBlock, IEncodableAMQDataBlock
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -23,11 +23,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Qpid.Common")]
+[assembly: AssemblyTitle("Apache.Qpid.Common")]
 [assembly: AssemblyDescription("Common AMQ Framing Code")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("Apache.Qpid.Common")]
 [assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2006")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
 using System;
 using System.Collections;
 
-namespace Qpid.Protocol
+namespace Apache.Qpid.Protocol
 {
    public sealed class AMQConstant
    {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj Tue Jul 31 08:53:37 2007
@@ -7,8 +7,8 @@
     <ProjectGuid>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Qpid</RootNamespace>
-    <AssemblyName>Qpid.Common</AssemblyName>
+    <RootNamespace>Apache.Qpid</RootNamespace>
+    <AssemblyName>Apache.Qpid.Common</AssemblyName>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
@@ -210,4 +210,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build Tue Jul 31 08:53:37 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Qpid.Common" default="build">
+<project name="Apache.Qpid.Common" default="build">
     <!--
 		Properties that come from master build file
 		- build.dir: root directory for build
@@ -18,9 +18,9 @@
          </sources>
          <references>
             <include name="${build.dir}/log4net.dll" />	
-            <include name="${build.dir}/Qpid.Buffer.dll" />	
-            <include name="${build.dir}/Qpid.Messaging.dll" />	
-            <include name="${build.dir}/Qpid.Codec.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Messaging.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Codec.dll" />	
          </references>
         </csc>
     </target>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl Tue Jul 31 08:53:37 2007
@@ -34,10 +34,10 @@
 <!-- main class generation template -->
 <xsl:template name="generate-class"> 
     <xsl:param name="f"/>
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 using System.Text;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
   ///
   /// <summary>This class is autogenerated
@@ -147,7 +147,7 @@
 using System.Collections;
 using log4net;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
 
 
@@ -202,7 +202,7 @@
     <xsl:result-document href="{$file}" format="textFormat">
 
 using System.Collections;
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
   /**
    * This class is autogenerated, do not modify. [From <xsl:value-of select="@protocol"/>]

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public enum AcknowledgeMode
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class ChannelLimitReachedException : ResourceAllocationException

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public enum DeliveryMode
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class ExchangeClassConstants
     {
@@ -26,4 +26,4 @@
         public readonly static string DIRECT = "direct";
         public readonly static string HEADERS = "headers";
     }
-}
\ No newline at end of file
+}

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class ExchangeNameDefaults
     {
@@ -26,4 +26,4 @@
         public readonly static string DIRECT = "amq.direct";
         public readonly static string HEADERS = "amq.match";        
     }
-}
\ No newline at end of file
+}

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IBytesMessage : IMessage
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IChannel.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IChannel.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IChannel.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IChannel.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public delegate void MessageReceivedDelegate(IMessage msg);
     
@@ -43,10 +43,23 @@
         bool Transacted { get; }
 
         /// <summary>
-        /// Prefetch value to be used as the default for consumers created on this channel.
+        /// Prefetch value to be used as the default for 
+        /// consumers created on this channel.
         /// </summary>
-        int DefaultPrefetch { get; set; }
-        
+        int DefaultPrefetch { get; }
+
+        /// <summary>
+        /// Prefetch low value to be used as the default for 
+        /// consumers created on this channel.
+        /// </summary>
+        int DefaultPrefetchLow { get; }
+
+        /// <summary>
+        /// Prefetch high value to be used as the default for 
+        /// consumers created on this channel.
+        /// </summary>
+        int DefaultPrefetchHigh { get; }
+
         /// <summary>
         /// Declare a new exchange
         /// </summary>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnection.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnection.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnection.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnection.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public delegate void ExceptionListenerDelegate(Exception ex);
 
@@ -47,6 +47,7 @@
 
         IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode);
         IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch);
+        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow);
 
         void Start();
         void Stop();

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IConnectionFactory
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IConnectionListener
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IFieldTable.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IFieldTable.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IFieldTable.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
  */
 using System.Collections;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IFieldTable : IEnumerable
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IHeaders.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IHeaders.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IHeaders.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IHeaders.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     /// <summary>
     /// IHeaders represents the header fields of an AMQ message and provides methods to access those fields. There are accessor methods to

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessage.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessage.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {   
     public interface IMessage
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
    /// <summary>
    /// Describes an object that can be used to receive (consume)

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
    /// <summary>
    /// Defines an object capable of publishing messages

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ITextMessage.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ITextMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ITextMessage.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface ITextMessage : IMessage
     {

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs Tue Jul 31 08:53:37 2007
@@ -18,25 +18,25 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class MessageConsumerBuilder
     {
-        public const int DEFAULT_PREFETCH_HIGH = 5000;
-
         private bool _noLocal = false;
         private bool _exclusive = false;
         private bool _durable = false;
         private string _subscriptionName = null;
         private IChannel _channel;
         private readonly string _queueName;
-        private int _prefetchLow = 2500;
-        private int _prefetchHigh = DEFAULT_PREFETCH_HIGH;
+        private int _prefetchLow;
+        private int _prefetchHigh;
 
         public MessageConsumerBuilder(IChannel channel, string queueName)
         {
             _channel = channel;
             _queueName = queueName;
+            _prefetchHigh = _channel.DefaultPrefetchHigh;
+            _prefetchLow = _channel.DefaultPrefetchLow;
         }
 
         public MessageConsumerBuilder WithPrefetchLow(int prefetchLow)

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class MessageNotReadableException : QpidException

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class MessageNotWriteableException : QpidException

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class MessagePublisherBuilder
     {
@@ -88,4 +88,4 @@
             return _channel.CreatePublisher(_exchangeName, _routingKey, _deliveryMode, _timeToLive, _immediate, _mandatory, _priority);
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -24,11 +24,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Qpid.Messaging")]
+[assembly: AssemblyTitle("Apache.Qpid.Messaging")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Qpid.Messaging")]
+[assembly: AssemblyProduct("Apache.Qpid.Messaging")]
 [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -53,4 +53,4 @@
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj Tue Jul 31 08:53:37 2007
@@ -7,8 +7,8 @@
     <ProjectGuid>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Qpid.Messaging</RootNamespace>
-    <AssemblyName>Qpid.Messaging</AssemblyName>
+    <RootNamespace>Apache.Qpid.Messaging</RootNamespace>
+    <AssemblyName>Apache.Qpid.Messaging</AssemblyName>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -66,4 +66,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/QpidException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/QpidException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/QpidException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/QpidException.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {   
     [Serializable]
     public class QpidException : Exception

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class ResourceAllocationException : QpidException

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/default.build Tue Jul 31 08:53:37 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Qpid.Messaging" default="build">
+<project name="Apache.Qpid.Messaging" default="build">
     <!--
 		Properties that come from master build file
 		- build.dir: root directory for build

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/App.config
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/App.config?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/App.config (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/App.config Tue Jul 31 08:53:37 2007
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
    <configSections>
-      <section name="qpid.sasl" type="Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Qpid.Sasl"/>
+      <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>
    </configSections>
 
    <qpid.sasl>
       <clientFactories>
-         <add type="Qpid.Sasl.Tests.TestClientFactory, Qpid.Sasl.Tests"/>
+         <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>
       </clientFactories>
    </qpid.sasl>
 </configuration>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs Tue Jul 31 08:53:37 2007
@@ -24,10 +24,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
 {
    [TestFixture]
    public class AnonymousSaslClientTests : ISaslCallbackHandler
@@ -69,4 +69,4 @@
 
    } // class AnonymousSaslClientTests
 
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs Tue Jul 31 08:53:37 2007
@@ -24,10 +24,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
 {
    [TestFixture]
    public class CramMD5SaslClientTests : ISaslCallbackHandler
@@ -87,4 +87,4 @@
       }
    } // class CramMD5SaslClientTests
 
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs Tue Jul 31 08:53:37 2007
@@ -25,10 +25,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
 {
    [TestFixture]
    public class DigestSaslClientTests : ISaslCallbackHandler
@@ -246,4 +246,4 @@
 
    } // class DigestSaslClientTests
 
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs Tue Jul 31 08:53:37 2007
@@ -24,10 +24,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
 {
    [TestFixture]
    public class ExternalSaslClientTests : ISaslCallbackHandler
@@ -68,4 +68,4 @@
 
    } // class AnonymousSaslClientTests
 
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs Tue Jul 31 08:53:37 2007
@@ -24,10 +24,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
 {
    [TestFixture]
    public class PlainSaslClientTests : ISaslCallbackHandler
@@ -85,4 +85,4 @@
 
    } // class PlainSaslClientTests
 
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Qpid.Sasl.Tests")]
+[assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Qpid.Sasl.Tests")]
+[assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj Tue Jul 31 08:53:37 2007
@@ -7,8 +7,8 @@
     <ProjectGuid>{587B3520-EBB9-41ED-B019-E96116B651CE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Qpid.Sasl.Tests</RootNamespace>
-    <AssemblyName>Qpid.Sasl.Tests</AssemblyName>
+    <RootNamespace>Apache.Qpid.Sasl.Tests</RootNamespace>
+    <AssemblyName>Apache.Qpid.Sasl.Tests</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,4 +64,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs Tue Jul 31 08:53:37 2007
@@ -24,10 +24,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests
+namespace Apache.Qpid.Sasl.Tests
 {
    [TestFixture]
    public class SaslTests : ISaslCallbackHandler
@@ -130,4 +130,4 @@
 
    } // class SaslTests
 
-} // namespace Qpid.Sasl.Tests
+} // namespace Apache.Qpid.Sasl.Tests

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs Tue Jul 31 08:53:37 2007
@@ -24,10 +24,10 @@
 using System.Text;
 
 using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl.Tests
+namespace Apache.Qpid.Sasl.Tests
 {
    public class TestClientFactory : ISaslClientFactory
    {
@@ -72,4 +72,4 @@
       }
    } // class TestSaslClient
 
-} // namespace Qpid.Sasl.Tests
+} // namespace Apache.Qpid.Sasl.Tests

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/default.build Tue Jul 31 08:53:37 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Qpid.Sasl" default="test">
+<project name="Apache.Qpid.Sasl" default="test">
 
    <target name="build">
         <csc target="library" 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Callbacks.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Callbacks.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Callbacks.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Callbacks.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    /// <summary>
    /// Marker interface for Sasl Callbacks
@@ -101,5 +101,6 @@
       }
    } // class RealmCallback
 
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs Tue Jul 31 08:53:37 2007
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Xml;
 
-namespace Qpid.Sasl.Configuration
+namespace Apache.Qpid.Sasl.Configuration
 {
    /// <summary>
    /// Represents an Sasl configuration section
@@ -85,5 +85,6 @@
 
    } // class SaslConfiguration
 
-} // namespace Qpid.Sasl.Configuration
+} // namespace Apache.Qpid.Sasl.Configuration
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs Tue Jul 31 08:53:37 2007
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Xml;
 
-namespace Qpid.Sasl.Configuration
+namespace Apache.Qpid.Sasl.Configuration
 {
    /// <summary>
    /// Defines the configuration section to configure extra 
@@ -79,5 +79,6 @@
       }
    } // class SaslConfigurationSectionHandler
 
-} // namespace Qpid.Sasl.Configuration
+} // namespace Apache.Qpid.Sasl.Configuration
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs Tue Jul 31 08:53:37 2007
@@ -22,9 +22,9 @@
 using System;
 using System.Collections;
 
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl.Mechanisms;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    public class DefaultClientFactory : ISaslClientFactory
    {
@@ -90,5 +90,6 @@
       }
    } // class DefaultClientFactory
 
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    public interface ISaslCallbackHandler
    {
@@ -30,5 +30,6 @@
 
    } // interface ISaslCallbackHandler
 
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClient.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    public interface ISaslClient
    {
@@ -37,5 +37,6 @@
 
    } // interface ISaslClient
 
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs Tue Jul 31 08:53:37 2007
@@ -23,7 +23,7 @@
 using System.Collections;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    public interface ISaslClientFactory
    {
@@ -35,5 +35,6 @@
          );
    } // interface ISaslClientFactory
 
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
 

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
 using System;
 using System.Security.Cryptography;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    /// <summary>
    /// Rough HMAC MD5 implementation as presented in
@@ -112,4 +112,4 @@
 
    } // class MD5HMAC
 
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs Tue Jul 31 08:53:37 2007
@@ -23,7 +23,7 @@
 using System.Collections;
 using System.Text;
 
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
 {
    /// <summary>
    /// Implements the ANONYMOUS authentication mechanism
@@ -66,4 +66,4 @@
 
    } // class AnonymousSaslClient
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs Tue Jul 31 08:53:37 2007
@@ -24,7 +24,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
 {
    /// <summary>
    /// Implements the CRAM-MD5 authentication mechanism as outlined
@@ -88,4 +88,4 @@
 
    } // class CramMD5SaslClient
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs Tue Jul 31 08:53:37 2007
@@ -26,7 +26,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
 {
 
    /// <summary>
@@ -573,4 +573,4 @@
 
    } // class DigestResponse
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs Tue Jul 31 08:53:37 2007
@@ -23,7 +23,7 @@
 using System.Collections;
 using System.Text;
 
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
 {
    /// <summary>
    /// Implements the EXTERNAL authentication mechanism
@@ -66,4 +66,4 @@
 
    } // class ExternalSaslClient
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs Tue Jul 31 08:53:37 2007
@@ -23,7 +23,7 @@
 using System.Collections;
 using System.Text;
 
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
 {
 
    /// <summary>
@@ -78,4 +78,4 @@
       #endregion // ISaslClient Implementation
 
    } // class PlainSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -6,11 +6,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Qpid.Sasl")]
+[assembly: AssemblyTitle("Apache.Qpid.Sasl")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache Qpid")]
+[assembly: AssemblyProduct("Apache.Qpid.Sasl")]
 [assembly: AssemblyCopyright("Copyright © 2007 The Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj Tue Jul 31 08:53:37 2007
@@ -7,8 +7,8 @@
     <ProjectGuid>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Qpid.Sasl</RootNamespace>
-    <AssemblyName>Qpid.Sasl</AssemblyName>
+    <RootNamespace>Apache.Qpid.Sasl</RootNamespace>
+    <AssemblyName>Apache.Qpid.Sasl</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,4 +61,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Sasl.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Sasl.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Sasl.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Sasl.cs Tue Jul 31 08:53:37 2007
@@ -24,9 +24,9 @@
 using System.Configuration;
 using System.Text;
 
-using Qpid.Sasl.Configuration;
+using Apache.Qpid.Sasl.Configuration;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    /// <summary>
    /// Static class used to access the SASL functionality. 
@@ -42,12 +42,12 @@
    /// <example><![CDATA[
    /// <configuration>
    ///   <configSections>
-   ///      <section name="qpid.sasl" type="Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Qpid.Sasl"/>
+   ///      <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>
    ///   </configSections>
    ///
    ///   <qpid.sasl>
    ///      <clientFactories>
-   ///         <add type="Qpid.Sasl.Tests.TestClientFactory, Qpid.Sasl.Tests"/>
+   ///         <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>
    ///      </clientFactories>
    ///   </qpid.sasl>
    /// </configuration>
@@ -112,4 +112,4 @@
       }
    } // class Sasl
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslClient.cs Tue Jul 31 08:53:37 2007
@@ -24,7 +24,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    public abstract class SaslClient : ISaslClient
    {
@@ -142,4 +142,4 @@
 
    } // class SaslClient
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslException.cs Tue Jul 31 08:53:37 2007
@@ -24,7 +24,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    /// <summary>
    /// Reports an exception during the processing of an SASL
@@ -53,4 +53,4 @@
 
    } // class SaslException
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslProperties.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslProperties.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslProperties.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/SaslProperties.cs Tue Jul 31 08:53:37 2007
@@ -23,7 +23,7 @@
 using System.Collections;
 using System.Text;
 
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
 {
    public sealed class SaslProperties
    {
@@ -39,4 +39,4 @@
  
    } // class SaslProperties
 
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/default.build Tue Jul 31 08:53:37 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Qpid.Sasl" default="build">
+<project name="Apache.Qpid.Sasl" default="build">
     <!--
 		Properties that come from master build file
 		- build.dir: root directory for build

Modified: incubator/qpid/trunk/qpid/dotnet/TopicListener/Program.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TopicListener/Program.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TopicListener/Program.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/TopicListener/Program.cs Tue Jul 31 08:53:37 2007
@@ -4,7 +4,7 @@
     {
         static void Main(string[] args)
         {
-            Qpid.Client.Tests.interop.TopicListener.Main(args);
+            Apache.Qpid.Client.Tests.interop.TopicListener.Main(args);
         }
     }
 }

Modified: incubator/qpid/trunk/qpid/dotnet/TopicListener/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TopicListener/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TopicListener/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/TopicListener/default.build Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
 			   <include name="**/*.cs" />
          </sources>
          <references>
-            <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
          </references>
         </csc>
     </target>

Modified: incubator/qpid/trunk/qpid/dotnet/TopicPublisher/Program.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TopicPublisher/Program.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TopicPublisher/Program.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/TopicPublisher/Program.cs Tue Jul 31 08:53:37 2007
@@ -4,7 +4,7 @@
     {
         static void Main(string[] args)
         {
-            Qpid.Client.Tests.interop.TopicPublisher.Main(args);
+            Apache.Qpid.Client.Tests.interop.TopicPublisher.Main(args);
         }
     }
 }

Modified: incubator/qpid/trunk/qpid/dotnet/TopicPublisher/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TopicPublisher/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TopicPublisher/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/TopicPublisher/default.build Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
 			   <include name="**/*.cs" />
          </sources>
          <references>
-            <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
          </references>
         </csc>
     </target>

Modified: incubator/qpid/trunk/qpid/dotnet/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/default.build Tue Jul 31 08:53:37 2007
@@ -22,7 +22,7 @@
       Fileset with build files for test assemblies
    -->
    <fileset id="tests.builds">
-      <include name="Qpid.Buffer.Tess/default.build" />
+      <include name="Qpid.Buffer.Tests/default.build" />
       <include name="Qpid.Sasl.Tests/default.build" />
       <include name="Qpid.Common.Tests/default.build" />        
       <include name="Qpid.Client.Tests/default.build" />	
@@ -123,4 +123,5 @@
    </target>
 	
 </project>
+
 

Modified: incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java (original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java Tue Jul 31 08:53:37 2007
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+ */
+
 package org.apache.qpid.gentools;
 
 import java.io.File;

Copied: incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh (from r553432, incubator/qpid/branches/M2/java/broker/bin/msTool.sh)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh?view=diff&rev=561365&p1=incubator/qpid/branches/M2/java/broker/bin/msTool.sh&r1=553432&p2=incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh&r2=561365
==============================================================================
--- incubator/qpid/branches/M2/java/broker/bin/msTool.sh (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh Tue Jul 31 08:53:37 2007
@@ -19,16 +19,38 @@
 #
 
 # Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar
+
+die() {
+  if [[ $1 = -usage ]]; then
+    shift
+    usage=true
+  else
+    usage=false
+  fi
+  echo "$@"
+  $usage && echo
+  $usage && usage
+  exit 1
+}
+
+cygwin=false
+if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
+  cygwin=true
+fi
+
+if $cygwin; then
+  QPID_TOOLS=$(cygpath -w $QPID_TOOLS)
+fi
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
        JAVA_VM=-server \
-       JAVA_OPTS=-Dlog4j.configuration=$QPID_TOOLS\etc\messagestoretool-log4j.xml \
+       JAVA_OPTS=-Dlog4j.configuration=file:$QPID_TOOLS/etc/mstool-log4j.xml \
        QPID_CLASSPATH=$QPID_LIBS
 
 if [ -z "$QPID_TOOLS" ]; then
-  die "QPID_HOME must be set"
+  die "QPID_TOOLS be set"
 fi
 
 . qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@"

Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd Tue Jul 31 08:53:37 2007
@@ -27,4 +27,4 @@
        JAVA_MEM=-Xmx1024m \
        QPID_CLASSPATH=$QPID_LIBS
 
-. qpid-run org.apache.qpid.server.security.Passwd "$@"
+. qpid-run org.apache.qpid.tools.security.Passwd "$@"

Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-server
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-server?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-server (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-server Tue Jul 31 08:53:37 2007
@@ -7,9 +7,9 @@
 # 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
@@ -25,7 +25,7 @@
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM=-Xmx1024m \
-       JAVA_GC=-XX:-UseConcMarkSweepGC
+       JAVA_GC=-XX:-UseConcMarkSweepGC \
        QPID_CLASSPATH=$QPID_LIBS
 
 . qpid-run org.apache.qpid.server.Main "$@"

Modified: incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml Tue Jul 31 08:53:37 2007
@@ -114,9 +114,9 @@
       <fileMode>473</fileMode>
     </file>
     <file>
-      <source>../bin/passwd</source>
+      <source>../bin/qpid-passwd</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>passwd</destName>
+      <destName>qpid-passwd</destName>
       <fileMode>473</fileMode>
     </file>
     <file>

Modified: incubator/qpid/trunk/qpid/java/broker/etc/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/etc/log4j.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/etc/log4j.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/etc/log4j.xml Tue Jul 31 08:53:37 2007
@@ -44,7 +44,7 @@
         <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
 
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>            
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
         </layout>
     </appender>
 
@@ -57,6 +57,15 @@
         </layout>
     </appender>
 
+    <appender name="AlertFile" class="org.apache.log4j.FileAppender">
+        <param name="File" value="${QPID_WORK}/log/alert.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
     <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
 
         <layout class="org.apache.log4j.PatternLayout">
@@ -64,15 +73,27 @@
         </layout>
     </appender>
 
-     <category name="Qpid.Broker">
+    <category name="Qpid.Broker">
+        <priority value="debug"/>
+        <appender-ref ref="AlertFile"/>
+    </category>
+
+    <category name="org.apache.qpid.server.queue.AMQQueueMBean">
         <priority value="info"/>
+        <appender-ref ref="AlertFile"/>
+    </category>
+
+    <!-- Provide warnings to standard output -->
+    <category name="org.apache.qpid">
+        <priority value="warn"/>
+        <appender-ref ref="STDOUT"/>
     </category>
 
-    <!--<category name="org.apache.qpid.server.store">
-        <priority value="debug"/>
-    </category-->
 
-    <!--category name="org.apache.qpid.server.queue">
+    <!-- Examples of additional logging settings -->
+    <!-- Used to generate extra debug. See debug.log4j.xml -->
+    
+    <!--<category name="org.apache.qpid.server.store">
         <priority value="debug"/>
     </category-->
 
@@ -80,10 +101,11 @@
         <priority value="debug"/>
     </category>-->
 
+    <!-- Log all info events to file -->
     <root>
         <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
         <appender-ref ref="FileAppender"/>
         <!--appender-ref ref="ArchivingFileAppender"/-->
     </root>
+
 </log4j:configuration>

Modified: incubator/qpid/trunk/qpid/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/pom.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/pom.xml Tue Jul 31 08:53:37 2007
@@ -101,6 +101,25 @@
     <build>
 
         <plugins>
+
+
+           <!--plugin>
+                <artifactId>minijar-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>minijars</goal>
+                        </goals>
+                        <configuration>
+                            <stripUnusedClasses>true</stripUnusedClasses>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin-->
+
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java Tue Jul 31 08:53:37 2007
@@ -31,15 +31,12 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.log4j.helpers.CountingQuietWriter;
 import org.apache.log4j.helpers.LogLog;
 import org.apache.log4j.helpers.OptionConverter;
 import org.apache.log4j.spi.LoggingEvent;
-
-import org.apache.qpid.framing.FieldTable;
 
 /**
  * <p>CompositeRollingAppender combines RollingFileAppender and DailyRollingFileAppender<br> It can function as either

Copied: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java (from r553432, incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java?view=diff&rev=561365&p1=incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java&r1=553432&p2=incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java&r2=561365
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java Tue Jul 31 08:53:37 2007
@@ -15,7 +15,6 @@
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
  *  under the License.    
- *
  * 
  */
 package org.apache.qpid.configuration;

Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Tue Jul 31 08:53:37 2007
@@ -582,9 +582,9 @@
         final List<UnacknowledgedMessage> msgToRequeue = new LinkedList<UnacknowledgedMessage>();
         final List<UnacknowledgedMessage> msgToResend = new LinkedList<UnacknowledgedMessage>();
 
-        if (_log.isInfoEnabled())
+        if (_log.isDebugEnabled())
         {
-            _log.info("unacked map Size:" + _unacknowledgedMessageMap.size());
+            _log.debug("unacked map Size:" + _unacknowledgedMessageMap.size());
         }
 
         // Process the Unacked-Map.
@@ -640,15 +640,15 @@
             });
 
         // Process Messages to Resend
-        if (_log.isInfoEnabled())
+        if (_log.isDebugEnabled())
         {
             if (!msgToResend.isEmpty())
             {
-                _log.info("Preparing (" + msgToResend.size() + ") message to resend.");
+                _log.debug("Preparing (" + msgToResend.size() + ") message to resend.");
             }
             else
             {
-                _log.info("No message to resend.");
+                _log.debug("No message to resend.");
             }
         }