You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/07/22 00:25:54 UTC
svn commit: r966443 - in
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: NOTICE.txt nant.build
src/main/csharp/CompressionPolicy.cs
src/test/csharp/Commands/MessageCompressionTest.cs
Author: tabish
Date: Wed Jul 21 22:25:54 2010
New Revision: 966443
URL: http://svn.apache.org/viewvc?rev=966443&view=rev
Log:
implements: https://issues.apache.org/activemq/browse/AMQNET-265
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/NOTICE.txt
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CompressionPolicy.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/NOTICE.txt?rev=966443&r1=966442&r2=966443&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/NOTICE.txt (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/NOTICE.txt Wed Jul 21 22:25:54 2010
@@ -10,3 +10,9 @@ Copyright 2005-2006 The Apache Software
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
+=========================================================================
+== DotNetZip Compression / Decompression Library Notice (ms-pl ==
+=========================================================================
+
+This product includes software developed by Cheeso
+http://dotnetzip.codeplex.com/
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=966443&r1=966442&r2=966443&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Wed Jul 21 22:25:54 2010
@@ -29,6 +29,7 @@
<!-- Lib organized as: module/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+ <property name="dotnetzip.dll" value="${basedir}/lib/DotNetZip/${current.build.framework}/Ionic.Zlib.dll" dynamic="true" />
<property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true" />
<property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true" />
<property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true" />
@@ -45,7 +46,7 @@
'vendor.fileset.names'. This comma-delimited list is iterated, and properties with
well-known suffixes are used to access and copy down vendor file dependencies.
-->
- <property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org" />
+ <property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org,vendor.dotnetzip.org" />
<!-- Property grouping for 'vendor.apache.org' -->
<property name="vendor.apache.org.name" value="Apache.NMS" />
@@ -63,6 +64,12 @@
<property name="vendor.nunit.org.group" value="org.nunit" />
<property name="vendor.nunit.org.version" value="2.5.5" />
<property name="vendor.nunit.org.filenames" value="nunit.framework.dll" />
+
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.dotnetzip.org.name" value="DotNetZip" />
+ <property name="vendor.dotnetzip.org.group" value="org.dotnetzip" />
+ <property name="vendor.dotnetzip.org.version" value="1.9.0" />
+ <property name="vendor.dotnetzip.org.filenames" value="Ionic.Zlib.dll" />
</target>
<target name="dependency-init" description="Initializes build dependencies">
@@ -71,6 +78,7 @@
<include name="${current.build.framework.assembly.dir}/System.dll" />
<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
<include name="${Apache.NMS.dll}" />
+ <include name="${dotnetzip.dll}" />
</assemblyfileset>
<assemblyfileset failonempty="true" id="test.dependencies">
@@ -81,6 +89,7 @@
<include name="${Apache.NMS.Test.dll}" />
<include name="${build.bin.dir}/${project.name}.dll" />
<include name="${nunit.dll}" />
+ <include name="${dotnetzip.dll}" />
</assemblyfileset>
<fileset id="content.filenames">
@@ -91,6 +100,7 @@
<include name="${Apache.NMS.pdb}" />
<include name="${Apache.NMS.Test.dll}" />
<include name="${Apache.NMS.Test.pdb}" />
+ <include name="${dotnetzip.dll}" />
<include name="${nunit.dll}" />
<include name="${NUnit.Projectfile}" />
</fileset>
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CompressionPolicy.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CompressionPolicy.cs?rev=966443&r1=966442&r2=966443&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CompressionPolicy.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CompressionPolicy.cs Wed Jul 21 22:25:54 2010
@@ -17,7 +17,6 @@
using System;
using System.IO;
-using System.IO.Compression;
namespace Apache.NMS.ActiveMQ
{
@@ -30,12 +29,12 @@ namespace Apache.NMS.ActiveMQ
{
public Stream CreateCompressionStream(Stream data)
{
- return new GZipStream(data, CompressionMode.Compress);
+ return new Ionic.Zlib.ZlibStream(data, Ionic.Zlib.CompressionMode.Compress);
}
public Stream CreateDecompressionStream(Stream data)
{
- return new GZipStream(data, CompressionMode.Decompress);
+ return new Ionic.Zlib.ZlibStream(data, Ionic.Zlib.CompressionMode.Decompress);
}
public object Clone()
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs?rev=966443&r1=966442&r2=966443&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs Wed Jul 21 22:25:54 2010
@@ -55,36 +55,12 @@ namespace Apache.NMS.ActiveMQ.Test
protected float m = 2.1F;
protected double n = 2.3;
- /// <summary>
- /// Test that we can set our own compression policy. Also works around the fact
- /// that sending a compressed Text Message to the broker using the default .NET
- /// compression will cause a BrokerException to be fired.
- /// </summary>
- class NoCompressionPolicy : ICompressionPolicy
- {
- public Stream CreateCompressionStream(Stream data)
- {
- return data;
- }
-
- public Stream CreateDecompressionStream(Stream data)
- {
- return data;
- }
-
- public Object Clone()
- {
- return this.MemberwiseClone();
- }
- }
-
[Test]
public void TestTextMessageCompression()
{
using(Connection connection = CreateConnection(TEST_CLIENT_ID) as Connection)
{
connection.UseCompression = true;
- connection.CompressionPolicy = new NoCompressionPolicy();
connection.Start();
Assert.IsTrue(connection.UseCompression);