Author: jgomes
Date: Fri Oct 24 11:35:55 2008
New Revision: 707703
URL: http://svn.apache.org/viewvc?rev=707703&view=rev
Log:
Fix Mono build errors.
Fixes [AMQNET-26]. (See https://issues.apache.org/activemq/browse/AMQNET-26)
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=707703&r1=707702&r2=707703&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Fri Oct 24 11:35:55
2008
@@ -35,6 +35,7 @@
<assemblyfileset failonempty="true" id="dependencies">
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
+ <include name="System.Web.dll" asis="true"/>
<include name="System.Xml.dll" asis="true"/>
</assemblyfileset>
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs?rev=707703&r1=707702&r2=707703&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
Fri Oct 24 11:35:55 2008
@@ -105,7 +105,7 @@
}
}
- private static String UrlDecode(String s)
+ public static String UrlDecode(String s)
{
#if !NETCF
return HttpUtility.HtmlDecode(s);
@@ -114,7 +114,7 @@
#endif
}
- private static String UrlEncode(String s)
+ public static String UrlEncode(String s)
{
#if !NETCF
return HttpUtility.HtmlEncode(s);
@@ -277,7 +277,6 @@
/// <param name="uri"></param>
/// <param name="rc"></param>
/// <param name="ssp"></param>
- /// <param name="p"></param>
private static void parseComposite(Uri uri, CompositeData rc,
String ssp)
{
String componentString;
@@ -353,13 +352,13 @@
/// <summary>
/// </summary>
/// <param name="componentString"></param>
- private static String[] splitComponents(String str)
+ private static String[] splitComponents(String componentString)
{
ArrayList l = new ArrayList();
int last = 0;
int depth = 0;
- char[] chars = str.ToCharArray();
+ char[] chars = componentString.ToCharArray();
for(int i = 0; i < chars.Length; i++)
{
switch(chars[i])
@@ -373,7 +372,7 @@
case ',':
if(depth == 0)
{
- String s = str.Substring(last, i);
+ String s =
componentString.Substring(last, i);
l.Add(s);
last = i + 1;
}
@@ -383,7 +382,7 @@
}
}
- String ending = str.Substring(last);
+ String ending = componentString.Substring(last);
if(ending.Length != 0)
{
l.Add(ending);