activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r751867 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/ Apache.NMS.EMS/trunk/ Apache.NMS.EMS/trunk/src/main/csharp/ Apache.NMS.MSMQ/trunk/ Apache.NMS.WCF/trunk/ Apache.NMS/trunk/ Apache....
Date Mon, 09 Mar 2009 22:07:51 GMT
Author: jgomes
Date: Mon Mar  9 22:07:50 2009
New Revision: 751867

URL: http://svn.apache.org/viewvc?rev=751867&view=rev
Log:
Added packaging script file.

Added:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1
Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nmsprovider-test.config
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar  9 22:07:50 2009
@@ -2,3 +2,4 @@
 obj
 *.suo
 lib
+package

Added: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1?rev=751867&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1 (added)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1 Mon Mar  9 22:07:50 2009
@@ -0,0 +1,94 @@
+# 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.
+
+$pkgname = "Apache.NMS.ActiveMQ"
+$pkgver = "1.1.0"
+$configurations = "release", "debug"
+$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0"
+
+function package-legalfiles($zipfile)
+{
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+}
+
+write-progress "Creating package directory." "Initializing..."
+if(!(test-path package))
+{
+	md package
+}
+
+pushd build
+
+$pkgdir = "..\package"
+
+write-progress "Packaging Application files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+	}
+}
+
+write-progress "Packaging PDB files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-PDBs-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+		}
+	}
+}
+
+write-progress "Packaging Unit test files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-UnitTests-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+		}
+	}
+}
+
+popd
+
+write-progress "Packaging Source code files." "Scanning..."
+$pkgdir = "package"
+$zipfile = "$pkgdir\$pkgname-$pkgver-src.zip"
+
+zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2008-activemq-test.csproj
vs2008-activemq.csproj vs2008-activemq.sln
+zip -9 -u -r "$zipfile" keyfile src
+
+write-progress "Packaging" "Complete."

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs?rev=751867&r1=751866&r2=751867&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs Mon Mar
 9 22:07:50 2009
@@ -441,23 +441,23 @@
 			}
 			else if(command is ConnectionError)
 			{
-			    if(!closing && !closed)
-			    {
-			        ConnectionError connectionError = (ConnectionError) command;
-			        BrokerError brokerError = connectionError.Exception;
-			        string message = "Broker connection error.";
-			        string cause = "";
-
-			        if(null != brokerError)
-			        {
-			            message = brokerError.Message;
-			            if(null != brokerError.Cause)
-			            {
-			                cause = brokerError.Cause.Message;
-			            }
-			        }
+				if(!closing && !closed)
+				{
+					ConnectionError connectionError = (ConnectionError) command;
+					BrokerError brokerError = connectionError.Exception;
+					string message = "Broker connection error.";
+					string cause = "";
+
+					if(null != brokerError)
+					{
+						message = brokerError.Message;
+						if(null != brokerError.Cause)
+						{
+							cause = brokerError.Cause.Message;
+						}
+					}
 
-			        OnException(commandTransport, new NMSConnectionException(message, cause));
+					OnException(commandTransport, new NMSConnectionException(message, cause));
 			    }
 			}
 			else

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar  9 22:07:50 2009
@@ -2,3 +2,4 @@
 obj
 *.suo
 lib
+package

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nmsprovider-test.config
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nmsprovider-test.config?rev=751867&r1=751866&r2=751867&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nmsprovider-test.config (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nmsprovider-test.config Mon Mar  9 22:07:50
2009
@@ -17,9 +17,6 @@
 -->
 <configuration>
 	<defaultURI value="ems:tcp://tibcohost:7222">
-		<factoryParams>
-			<param type="string" value="NMSTestClient"/>
-		</factoryParams>
 		<userName value="guest"/>
 		<passWord value="guest"/>
 	</defaultURI>

Added: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1?rev=751867&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1 (added)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1 Mon Mar  9 22:07:50 2009
@@ -0,0 +1,94 @@
+# 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.
+
+$pkgname = "Apache.NMS.EMS"
+$pkgver = "1.1.0"
+$configurations = "release", "debug"
+$frameworks = "net-2.0", "net-3.5"
+
+function package-legalfiles($zipfile)
+{
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+}
+
+write-progress "Creating package directory." "Initializing..."
+if(!(test-path package))
+{
+	md package
+}
+
+pushd build
+
+$pkgdir = "..\package"
+
+write-progress "Packaging Application files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+	}
+}
+
+write-progress "Packaging PDB files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-PDBs-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+		}
+	}
+}
+
+write-progress "Packaging Unit test files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-UnitTests-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+		}
+	}
+}
+
+popd
+
+write-progress "Packaging Source code files." "Scanning..."
+$pkgdir = "package"
+$zipfile = "$pkgdir\$pkgname-$pkgver-src.zip"
+
+zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2008-ems-test.csproj
vs2008-ems.csproj vs2008-ems.sln
+zip -9 -u -r "$zipfile" keyfile src
+
+write-progress "Packaging" "Complete."

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs?rev=751867&r1=751866&r2=751867&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs Mon
Mar  9 22:07:50 2009
@@ -51,8 +51,17 @@
 		}
 
 		public ConnectionFactory(string serverUrl)
-			: this(serverUrl, Guid.NewGuid().ToString())
 		{
+			try
+			{
+				this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(serverUrl);
+			}
+			catch(Exception ex)
+			{
+				Apache.NMS.Tracer.DebugFormat("Exception instantiating TIBCO.EMS.ConnectionFactory: {0}",
ex.Message);
+			}
+
+			VerifyConnectionFactory();
 		}
 
 		public ConnectionFactory(string serverUrl, string clientId)

Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar  9 22:07:50 2009
@@ -2,3 +2,4 @@
 obj
 *.suo
 lib
+package

Added: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1?rev=751867&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1 (added)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1 Mon Mar  9 22:07:50 2009
@@ -0,0 +1,94 @@
+# 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.
+
+$pkgname = "Apache.NMS.MSMQ"
+$pkgver = "1.1.0"
+$configurations = "release", "debug"
+$frameworks = "net-1.1", "net-2.0", "net-3.5"
+
+function package-legalfiles($zipfile)
+{
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+}
+
+write-progress "Creating package directory." "Initializing..."
+if(!(test-path package))
+{
+	md package
+}
+
+pushd build
+
+$pkgdir = "..\package"
+
+write-progress "Packaging Application files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+	}
+}
+
+write-progress "Packaging PDB files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-PDBs-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+		}
+	}
+}
+
+write-progress "Packaging Unit test files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-UnitTests-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+		}
+	}
+}
+
+popd
+
+write-progress "Packaging Source code files." "Scanning..."
+$pkgdir = "package"
+$zipfile = "$pkgdir\$pkgname-$pkgver-src.zip"
+
+zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2008-msmq-test.csproj
vs2008-msmq.csproj vs2008-msmq.sln
+zip -9 -u -r "$zipfile" keyfile src
+
+write-progress "Packaging" "Complete."

Propchange: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar  9 22:07:50 2009
@@ -2,3 +2,4 @@
 obj
 *.suo
 lib
+package

Added: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1?rev=751867&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1 (added)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1 Mon Mar  9 22:07:50 2009
@@ -0,0 +1,94 @@
+# 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.
+
+$pkgname = "Apache.NMS.WCF"
+$pkgver = "1.0.0"
+$configurations = "release", "debug"
+$frameworks = "net-3.5"
+
+function package-legalfiles($zipfile)
+{
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+}
+
+write-progress "Creating package directory." "Initializing..."
+if(!(test-path package))
+{
+	md package
+}
+
+pushd build
+
+$pkgdir = "..\package"
+
+write-progress "Packaging Application files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+	}
+}
+
+write-progress "Packaging PDB files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-PDBs-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+		}
+	}
+}
+
+write-progress "Packaging Unit test files." "Scanning..."
+foreach($configuration in $configurations)
+{
+	$zipfile = "$pkgdir\$pkgname-$pkgver-UnitTests-$configuration.zip"
+	package-legalfiles $zipfile
+	foreach($framework in $frameworks)
+	{
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+		if($framework -ieq "mono-2.0")
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+		}
+		else
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+		}
+	}
+}
+
+popd
+
+write-progress "Packaging Source code files." "Scanning..."
+$pkgdir = "package"
+$zipfile = "$pkgdir\$pkgname-$pkgver-src.zip"
+
+zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2008-wcf.csproj
vs2008-wcf.sln
+zip -9 -u -r "$zipfile" keyfile src
+
+write-progress "Packaging" "Complete."

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1?rev=751867&r1=751866&r2=751867&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1 Mon Mar  9 22:07:50 2009
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$pkgname = "Apache.NMS"
 $pkgver = "1.1.0"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-1.1", "net-2.0", "net-3.5", "netcf-2.0"
@@ -36,28 +37,28 @@
 write-progress "Packaging Application files." "Scanning..."
 foreach($configuration in $configurations)
 {
-	$zipfile = "$pkgdir\Apache.NMS-$pkgver-bin-$configuration.zip"
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin-$configuration.zip"
 	package-legalfiles $zipfile
 	foreach($framework in $frameworks)
 	{
-		zip -9 -u "$zipfile" "$framework\$configuration\Apache.NMS.dll"
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
 	}
 }
 
 write-progress "Packaging PDB files." "Scanning..."
 foreach($configuration in $configurations)
 {
-	$zipfile = "$pkgdir\Apache.NMS-$pkgver-PDBs-$configuration.zip"
+	$zipfile = "$pkgdir\$pkgname-$pkgver-PDBs-$configuration.zip"
 	package-legalfiles $zipfile
 	foreach($framework in $frameworks)
 	{
 		if($framework -ieq "mono-2.0")
 		{
-			zip -9 -u "$zipfile" "$framework\$configuration\Apache.NMS.dll.mdb"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
 		}
 		else
 		{
-			zip -9 -u "$zipfile" "$framework\$configuration\Apache.NMS.pdb"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
 		}
 	}
 }
@@ -65,18 +66,18 @@
 write-progress "Packaging Unit test files." "Scanning..."
 foreach($configuration in $configurations)
 {
-	$zipfile = "$pkgdir\Apache.NMS-$pkgver-UnitTests-$configuration.zip"
+	$zipfile = "$pkgdir\$pkgname-$pkgver-UnitTests-$configuration.zip"
 	package-legalfiles $zipfile
 	foreach($framework in $frameworks)
 	{
-		zip -9 -u "$zipfile" "$framework\$configuration\Apache.NMS.Test.dll"
+		zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
 		if($framework -ieq "mono-2.0")
 		{
-			zip -9 -u "$zipfile" "$framework\$configuration\Apache.NMS.Test.dll.mdb"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
 		}
 		else
 		{
-			zip -9 -u "$zipfile" "$framework\$configuration\Apache.NMS.Test.pdb"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
 		}
 	}
 }
@@ -85,9 +86,9 @@
 
 write-progress "Packaging Source code files." "Scanning..."
 $pkgdir = "package"
-$zipfile = "$pkgdir\Apache.NMS-$pkgver-src.zip"
+$zipfile = "$pkgdir\$pkgname-$pkgver-src.zip"
 
 zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2008-nms-test.csproj
vs2008-nms.csproj vs2008-nms.sln
-zip -9 -u -r "$zipfile" keyfile lib src
+zip -9 -u -r "$zipfile" keyfile src
 
 write-progress "Packaging" "Complete."

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs?rev=751867&r1=751866&r2=751867&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs Mon Mar  9
22:07:50 2009
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 using System;
-using NUnit.Framework;
+using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
@@ -41,78 +43,54 @@
 			}
 		}
 
-        /// <summary>
-        /// Verify disposing a connection after a consumer has been created and disposed.
-        /// </summary>
-        [Test]
-        public void DisposeConnectionAfterDisposingConsumer()
-        {
-            CreateAndDisposeWithConsumer(true);
-        }
-
-        /// <summary>
-        /// Verify disposing a connection after a consumer has been created but not disposed.
-        /// </summary>
-        [Test]
-        public void DisposeConnectionWithoutDisposingConsumer()
-        {
-            CreateAndDisposeWithConsumer(false);
-        }
-
-        /// <summary>
-        /// Verify disposing a connection after a producer has been created and disposed.
-        /// </summary>
-        [Test]
-        public void DisposeConnectionAfterDisposingProducer()
-        {
-            CreateAndDisposeWithProducer(true);
-        }
-
-        /// <summary>
-        /// Verify disposing a connection after a producer has been created but not disposed.
-        /// </summary>
-        [Test]
-        public void DisposeConnectionWithoutDisposingProducer()
-        {
-            CreateAndDisposeWithProducer(false);
-        }
-
-        private void CreateAndDisposeWithConsumer(bool disposeConsumer)
-        {
-            IConnection connection = CreateConnection("DisposalTestConnection");
-            connection.Start();
-
-            ISession session = connection.CreateSession();
-            IQueue queue = session.GetQueue("DisposalTestQueue");
-
-            IMessageConsumer consumer = session.CreateConsumer(queue);
-
-            connection.Stop();
-
-            if (disposeConsumer)
-                consumer.Dispose();
-
-            session.Dispose();
-            connection.Dispose();
-        }
-
-        private void CreateAndDisposeWithProducer(bool disposeProducer)
-        {
-            IConnection connection = CreateConnection("DisposalTestConnection");
-            connection.Start();
-
-            ISession session = connection.CreateSession();
-            IQueue queue = session.GetQueue("DisposalTestQueue");
-
-            IMessageProducer producer = session.CreateProducer(queue);
-
-            connection.Stop();
-
-            if (disposeProducer)
-                producer.Dispose();
-
-            session.Dispose();
-            connection.Dispose();
+#if !NET_1_1
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+#endif
+		public void CreateAndDisposeWithConsumer(bool disposeConsumer)
+        {
+			using(IConnection connection = CreateConnection("DisposalTestConnection"))
+			{
+				connection.Start();
+
+				using(ISession session = connection.CreateSession())
+				{
+					IQueue queue = session.GetQueue("DisposalTestQueue");
+					IMessageConsumer consumer = session.CreateConsumer(queue);
+
+					connection.Stop();
+					if(disposeConsumer)
+					{
+						consumer.Dispose();
+					}
+				}
+			}
+        }
+
+#if !NET_1_1
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+#endif
+		public void CreateAndDisposeWithProducer(bool disposeProducer)
+        {
+			using(IConnection connection = CreateConnection("DisposalTestConnection"))
+			{
+				connection.Start();
+
+				using(ISession session = connection.CreateSession())
+				{
+					IQueue queue = session.GetQueue("DisposalTestQueue");
+					IMessageProducer producer = session.CreateProducer(queue);
+
+					connection.Stop();
+					if(disposeProducer)
+					{
+						producer.Dispose();
+					}
+				}
+			}
         }
 	}
 }



Mime
View raw message