diff options
33 files changed, 106 insertions, 106 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 6921360f09c..37c05e7454c 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -210,12 +210,12 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream) _out << sp << nl << "public override bool ice_isA(string s)"; _out << sb; - _out << nl << "return _System.Array.BinarySearch(ids__, s, IceUtil.StringUtil.OrdinalStringComparer) >= 0;"; + _out << nl << "return _System.Array.BinarySearch(ids__, s, IceUtilInternal.StringUtil.OrdinalStringComparer) >= 0;"; _out << eb; _out << sp << nl << "public override bool ice_isA(string s, Ice.Current current__)"; _out << sb; - _out << nl << "return _System.Array.BinarySearch(ids__, s, IceUtil.StringUtil.OrdinalStringComparer) >= 0;"; + _out << nl << "return _System.Array.BinarySearch(ids__, s, IceUtilInternal.StringUtil.OrdinalStringComparer) >= 0;"; _out << eb; _out << sp << nl << "public override string[] ice_ids()"; @@ -580,7 +580,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream) << "dispatch__(IceInternal.Incoming inS__, Ice.Current current__)"; _out << sb; _out << nl << "int pos = _System.Array.BinarySearch(all__, current__.operation, " - << "IceUtil.StringUtil.OrdinalStringComparer);"; + << "IceUtilInternal.StringUtil.OrdinalStringComparer);"; _out << nl << "if(pos < 0)"; _out << sb; _out << nl << "throw new Ice.OperationNotExistException(current__.id, current__.facet, current__.operation);"; diff --git a/cs/src/Ice/Arrays.cs b/cs/src/Ice/Arrays.cs index ecba0e893aa..1f38db18df6 100644 --- a/cs/src/Ice/Arrays.cs +++ b/cs/src/Ice/Arrays.cs @@ -9,7 +9,7 @@ using System.Collections; -namespace IceUtil +namespace IceUtilInternal { public sealed class Arrays diff --git a/cs/src/Ice/AssemblyUtil.cs b/cs/src/Ice/AssemblyUtil.cs index 7342d2d9108..327b9f080f7 100644 --- a/cs/src/Ice/AssemblyUtil.cs +++ b/cs/src/Ice/AssemblyUtil.cs @@ -76,7 +76,7 @@ namespace IceInternal public static Type[] findTypesWithPrefix(string prefix) { - IceUtil.LinkedList l = new IceUtil.LinkedList(); + IceUtilInternal.LinkedList l = new IceUtilInternal.LinkedList(); loadAssemblies(); // Lazy initialization diff --git a/cs/src/Ice/Base64.cs b/cs/src/Ice/Base64.cs index 17caee4c789..9b3260e16db 100644 --- a/cs/src/Ice/Base64.cs +++ b/cs/src/Ice/Base64.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -namespace IceUtil +namespace IceUtilInternal { public class Base64 diff --git a/cs/src/Ice/BasicStream.cs b/cs/src/Ice/BasicStream.cs index a8aaf8a2659..65a07ab295f 100644 --- a/cs/src/Ice/BasicStream.cs +++ b/cs/src/Ice/BasicStream.cs @@ -1978,7 +1978,7 @@ namespace IceInternal if(index < 0 && patcher != null) { int i = -index; - IceUtil.LinkedList patchlist = (IceUtil.LinkedList)_readEncapsStack.patchMap[i]; + IceUtilInternal.LinkedList patchlist = (IceUtilInternal.LinkedList)_readEncapsStack.patchMap[i]; if(patchlist == null) { // @@ -1986,7 +1986,7 @@ namespace IceInternal // for this index, so make a new entry in the // patch map. // - patchlist = new IceUtil.LinkedList(); + patchlist = new IceUtilInternal.LinkedList(); _readEncapsStack.patchMap[i] = patchlist; } // @@ -2282,7 +2282,7 @@ namespace IceInternal Debug.Assert( ((object)instanceIndex != null && (object)patchIndex == null) || ((object)instanceIndex == null && (object)patchIndex != null)); - IceUtil.LinkedList patchlist; + IceUtilInternal.LinkedList patchlist; Ice.Object v; if((object)instanceIndex != null) { @@ -2290,7 +2290,7 @@ namespace IceInternal // We have just unmarshaled an instance -- check if // something needs patching for that instance. // - patchlist = (IceUtil.LinkedList)_readEncapsStack.patchMap[instanceIndex]; + patchlist = (IceUtilInternal.LinkedList)_readEncapsStack.patchMap[instanceIndex]; if(patchlist == null) { return; // We don't have anything to patch for the instance just unmarshaled. @@ -2309,7 +2309,7 @@ namespace IceInternal { return; // We haven't unmarshaled the instance for this index yet. } - patchlist = (IceUtil.LinkedList)_readEncapsStack.patchMap[patchIndex]; + patchlist = (IceUtilInternal.LinkedList)_readEncapsStack.patchMap[patchIndex]; } Debug.Assert(patchlist != null && patchlist.Count > 0); Debug.Assert(v != null); diff --git a/cs/src/Ice/ConnectionFactory.cs b/cs/src/Ice/ConnectionFactory.cs index b939790de70..8f81d74abc3 100644 --- a/cs/src/Ice/ConnectionFactory.cs +++ b/cs/src/Ice/ConnectionFactory.cs @@ -15,7 +15,7 @@ namespace IceInternal using System.Diagnostics; using System.Net.Sockets; using System.Threading; - using IceUtil; + using IceUtilInternal; public sealed class OutgoingConnectionFactory { diff --git a/cs/src/Ice/ConnectionMonitor.cs b/cs/src/Ice/ConnectionMonitor.cs index b53f81b3d1d..a97712bf32f 100644 --- a/cs/src/Ice/ConnectionMonitor.cs +++ b/cs/src/Ice/ConnectionMonitor.cs @@ -11,7 +11,7 @@ namespace IceInternal { using System.Diagnostics; - using IceUtil; + using IceUtilInternal; public sealed class ConnectionMonitor : TimerTask { diff --git a/cs/src/Ice/Exception.cs b/cs/src/Ice/Exception.cs index 798ce23b676..512eeea2e22 100644 --- a/cs/src/Ice/Exception.cs +++ b/cs/src/Ice/Exception.cs @@ -45,7 +45,7 @@ namespace Ice // doesn't appear to be possible to reformat it. // System.IO.StringWriter sw = new System.IO.StringWriter(); - IceUtil.OutputBase op = new IceUtil.OutputBase(sw); + IceUtilInternal.OutputBase op = new IceUtilInternal.OutputBase(sw); op.setUseTab(false); op.print(GetType().FullName); op.inc(); diff --git a/cs/src/Ice/Incoming.cs b/cs/src/Ice/Incoming.cs index 17df2c59ef2..35d577abf83 100644 --- a/cs/src/Ice/Incoming.cs +++ b/cs/src/Ice/Incoming.cs @@ -128,11 +128,11 @@ namespace IceInternal using(StringWriter sw = new StringWriter()) { - IceUtil.OutputBase output = new IceUtil.OutputBase(sw); + IceUtilInternal.OutputBase output = new IceUtilInternal.OutputBase(sw); output.setUseTab(false); output.print("dispatch exception:"); output.print("\nidentity: " + os_.instance().identityToString(current_.id)); - output.print("\nfacet: " + IceUtil.StringUtil.escapeString(current_.facet, "")); + output.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(current_.facet, "")); output.print("\noperation: " + current_.operation); output.print("\n"); output.print(ex.ToString()); diff --git a/cs/src/Ice/Instance.cs b/cs/src/Ice/Instance.cs index 98fb0dd7a83..bc72746e67a 100644 --- a/cs/src/Ice/Instance.cs +++ b/cs/src/Ice/Instance.cs @@ -1045,7 +1045,7 @@ namespace IceInternal private Dictionary<string, string> _defaultContext; private Ice.ObjectAdapter _adminAdapter; private Dictionary<string, Ice.Object> _adminFacets = new Dictionary<string, Ice.Object>(); - private IceUtil.Set _adminFacetFilter = new IceUtil.Set(); + private IceUtilInternal.Set _adminFacetFilter = new IceUtilInternal.Set(); private Ice.Identity _adminIdentity; private static Dictionary<string, string> _emptyContext = new Dictionary<string, string>(); diff --git a/cs/src/Ice/LinkedList.cs b/cs/src/Ice/LinkedList.cs index 4aa03626d9a..a27cef29613 100644 --- a/cs/src/Ice/LinkedList.cs +++ b/cs/src/Ice/LinkedList.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -namespace IceUtil +namespace IceUtilInternal { using System; using System.Collections; diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs index 21ca7715ba3..3620be4545b 100644 --- a/cs/src/Ice/ObjectAdapterFactory.cs +++ b/cs/src/Ice/ObjectAdapterFactory.cs @@ -12,7 +12,7 @@ namespace IceInternal using System.Collections; using System.Diagnostics; - using IceUtil; + using IceUtilInternal; public sealed class ObjectAdapterFactory { diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs index 9c995aabf02..9c9cbd6074e 100644 --- a/cs/src/Ice/ObjectAdapterI.cs +++ b/cs/src/Ice/ObjectAdapterI.cs @@ -533,7 +533,7 @@ namespace Ice for(int i = 0; i < sz; ++i) { IceInternal.IncomingConnectionFactory factory = _incomingConnectionFactories[i]; - IceUtil.LinkedList l = factory.connections(); + IceUtilInternal.LinkedList l = factory.connections(); foreach(ConnectionI conn in l) { connections.Add(conn); @@ -1126,7 +1126,7 @@ namespace Ice List<IceInternal.EndpointI> endpoints = new List<IceInternal.EndpointI>(); while(end < endpts.Length) { - beg = IceUtil.StringUtil.findFirstNotOf(endpts, delim, end); + beg = IceUtilInternal.StringUtil.findFirstNotOf(endpts, delim, end); if(beg == -1) { break; diff --git a/cs/src/Ice/Options.cs b/cs/src/Ice/Options.cs index 2256ae90937..7f8b7313ae8 100644 --- a/cs/src/Ice/Options.cs +++ b/cs/src/Ice/Options.cs @@ -10,7 +10,7 @@ using System.Collections; using System.Diagnostics; -namespace IceUtil +namespace IceUtilInternal { public sealed class Options { diff --git a/cs/src/Ice/OutputBase.cs b/cs/src/Ice/OutputBase.cs index 68923169481..6f17decec54 100644 --- a/cs/src/Ice/OutputBase.cs +++ b/cs/src/Ice/OutputBase.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -namespace IceUtil +namespace IceUtilInternal { using System.Collections; diff --git a/cs/src/Ice/Proxy.cs b/cs/src/Ice/Proxy.cs index 754ac968975..7230bfa5ba4 100644 --- a/cs/src/Ice/Proxy.cs +++ b/cs/src/Ice/Proxy.cs @@ -11,7 +11,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using IceUtil; +using IceUtilInternal; namespace Ice { diff --git a/cs/src/Ice/Reference.cs b/cs/src/Ice/Reference.cs index b5fc1a56a91..84635576949 100644 --- a/cs/src/Ice/Reference.cs +++ b/cs/src/Ice/Reference.cs @@ -250,7 +250,7 @@ namespace IceInternal // the identity string in quotes. // string id = instance_.identityToString(identity_); - if(IceUtil.StringUtil.findFirstOf(id, " \t\n\r:@") != -1) + if(IceUtilInternal.StringUtil.findFirstOf(id, " \t\n\r:@") != -1) { s.Append('"'); s.Append(id); @@ -269,8 +269,8 @@ namespace IceInternal // the facet string in quotes. // s.Append(" -f "); - string fs = IceUtil.StringUtil.escapeString(facet_, ""); - if(IceUtil.StringUtil.findFirstOf(fs, " \t\n\r:@") != -1) + string fs = IceUtilInternal.StringUtil.escapeString(facet_, ""); + if(IceUtilInternal.StringUtil.findFirstOf(fs, " \t\n\r:@") != -1) { s.Append('"'); s.Append(fs); @@ -593,7 +593,7 @@ namespace IceInternal { return false; } - return IceUtil.Arrays.Equals(_fixedConnections, rhs._fixedConnections); + return IceUtilInternal.Arrays.Equals(_fixedConnections, rhs._fixedConnections); } // @@ -686,11 +686,11 @@ namespace IceInternal } else if(getPreferSecure()) { - IceUtil.Arrays.Sort(ref connections, _preferSecureConnectionComparator); + IceUtilInternal.Arrays.Sort(ref connections, _preferSecureConnectionComparator); } else { - IceUtil.Arrays.Sort(ref connections, _preferNonSecureConnectionComparator); + IceUtilInternal.Arrays.Sort(ref connections, _preferNonSecureConnectionComparator); } Ice.ConnectionI[] arr = new Ice.ConnectionI[connections.Count]; @@ -1124,11 +1124,11 @@ namespace IceInternal } else if(getPreferSecure()) { - IceUtil.Arrays.Sort(ref endpoints, _preferSecureEndpointComparator); + IceUtilInternal.Arrays.Sort(ref endpoints, _preferSecureEndpointComparator); } else { - IceUtil.Arrays.Sort(ref endpoints, _preferNonSecureEndpointComparator); + IceUtilInternal.Arrays.Sort(ref endpoints, _preferNonSecureEndpointComparator); } EndpointI[] arr = new EndpointI[endpoints.Count]; @@ -1595,7 +1595,7 @@ namespace IceInternal { return false; } - return IceUtil.Arrays.Equals(_endpoints, rhs._endpoints); + return IceUtilInternal.Arrays.Equals(_endpoints, rhs._endpoints); } // @@ -1734,8 +1734,8 @@ namespace IceInternal // the reference parser uses as separators, then we enclose // the adapter id string in quotes. // - string a = IceUtil.StringUtil.escapeString(adapterId_, null); - if(IceUtil.StringUtil.findFirstOf(a, " \t\n\r") != -1) + string a = IceUtilInternal.StringUtil.escapeString(adapterId_, null); + if(IceUtilInternal.StringUtil.findFirstOf(a, " \t\n\r") != -1) { s.Append('"'); s.Append(a); diff --git a/cs/src/Ice/ReferenceFactory.cs b/cs/src/Ice/ReferenceFactory.cs index 7ca28d49a64..847abc8496b 100644 --- a/cs/src/Ice/ReferenceFactory.cs +++ b/cs/src/Ice/ReferenceFactory.cs @@ -149,7 +149,7 @@ namespace IceInternal int beg; int end = 0; - beg = IceUtil.StringUtil.findFirstNotOf(s, delim, end); + beg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end); if(beg == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -162,7 +162,7 @@ namespace IceInternal // or double quotation marks. // string idstr = null; - end = IceUtil.StringUtil.checkQuote(s, beg); + end = IceUtilInternal.StringUtil.checkQuote(s, beg); if(end == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -171,7 +171,7 @@ namespace IceInternal } else if(end == 0) { - end = IceUtil.StringUtil.findFirstOf(s, delim + ":@", beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim + ":@", beg); if(end == -1) { end = s.Length; @@ -215,7 +215,7 @@ namespace IceInternal // a null proxy, but only if nothing follows the // quotes. // - else if(IceUtil.StringUtil.findFirstNotOf(s, delim, end) != -1) + else if(IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end) != -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); e.str = s; @@ -234,7 +234,7 @@ namespace IceInternal while(true) { - beg = IceUtil.StringUtil.findFirstNotOf(s, delim, end); + beg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end); if(beg == -1) { break; @@ -245,7 +245,7 @@ namespace IceInternal break; } - end = IceUtil.StringUtil.findFirstOf(s, delim + ":@", beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim + ":@", beg); if(end == -1) { end = s.Length; @@ -270,14 +270,14 @@ namespace IceInternal // quotation marks. // string argument = null; - int argumentBeg = IceUtil.StringUtil.findFirstNotOf(s, delim, end); + int argumentBeg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end); if(argumentBeg != -1) { char ch = s[argumentBeg]; if(ch != '@' && ch != ':' && ch != '-') { beg = argumentBeg; - end = IceUtil.StringUtil.checkQuote(s, beg); + end = IceUtilInternal.StringUtil.checkQuote(s, beg); if(end == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -286,7 +286,7 @@ namespace IceInternal } else if(end == 0) { - end = IceUtil.StringUtil.findFirstOf(s, delim + ":@", beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim + ":@", beg); if(end == -1) { end = s.Length; @@ -318,7 +318,7 @@ namespace IceInternal } string token; - if(!IceUtil.StringUtil.unescapeString(argument, 0, argument.Length, out token)) + if(!IceUtilInternal.StringUtil.unescapeString(argument, 0, argument.Length, out token)) { Ice.ProxyParseException e = new Ice.ProxyParseException(); e.str = s; @@ -515,7 +515,7 @@ namespace IceInternal } else if(s[beg] == '@') { - beg = IceUtil.StringUtil.findFirstNotOf(s, delim, beg + 1); + beg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, beg + 1); if(beg == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -524,7 +524,7 @@ namespace IceInternal } string adapterstr = null; - end = IceUtil.StringUtil.checkQuote(s, beg); + end = IceUtilInternal.StringUtil.checkQuote(s, beg); if(end == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -533,7 +533,7 @@ namespace IceInternal } else if(end == 0) { - end = IceUtil.StringUtil.findFirstOf(s, delim, beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim, beg); if(end == -1) { end = s.Length; @@ -547,14 +547,14 @@ namespace IceInternal end++; // Skip trailing quote } - if(end != s.Length && IceUtil.StringUtil.findFirstNotOf(s, delim, end) != -1) + if(end != s.Length && IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end) != -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); e.str = s; throw e; } - if(!IceUtil.StringUtil.unescapeString(adapterstr, 0, adapterstr.Length, out adapter) || + if(!IceUtilInternal.StringUtil.unescapeString(adapterstr, 0, adapterstr.Length, out adapter) || adapter.Length == 0) { Ice.ProxyParseException e = new Ice.ProxyParseException(); diff --git a/cs/src/Ice/RouterInfo.cs b/cs/src/Ice/RouterInfo.cs index b7ae00d4314..d184f5b0d50 100644 --- a/cs/src/Ice/RouterInfo.cs +++ b/cs/src/Ice/RouterInfo.cs @@ -312,7 +312,7 @@ namespace IceInternal private EndpointI[] _clientEndpoints; private EndpointI[] _serverEndpoints; private Ice.ObjectAdapter _adapter; - private IceUtil.Set _identities = new IceUtil.Set(); + private IceUtilInternal.Set _identities = new IceUtilInternal.Set(); private List<Ice.Identity> _evictedIdentities = new List<Ice.Identity>(); } diff --git a/cs/src/Ice/ServantManager.cs b/cs/src/Ice/ServantManager.cs index ef48979435e..78328b907d9 100644 --- a/cs/src/Ice/ServantManager.cs +++ b/cs/src/Ice/ServantManager.cs @@ -41,7 +41,7 @@ public sealed class ServantManager ex.kindOfObject = "servant"; if(facet.Length > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -72,7 +72,7 @@ public sealed class ServantManager ex.kindOfObject = "servant"; if(facet.Length > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -191,7 +191,7 @@ public sealed class ServantManager if(l != null) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = IceUtil.StringUtil.escapeString(category, ""); + ex.id = IceUtilInternal.StringUtil.escapeString(category, ""); ex.kindOfObject = "servant locator"; throw ex; } diff --git a/cs/src/Ice/Set.cs b/cs/src/Ice/Set.cs index 063e3d3d2ee..2e151ac0aa5 100644 --- a/cs/src/Ice/Set.cs +++ b/cs/src/Ice/Set.cs @@ -11,7 +11,7 @@ using System; using System.Collections; using System.Diagnostics; -namespace IceUtil +namespace IceUtilInternal { public class Set : ICollection, ICloneable { diff --git a/cs/src/Ice/StringUtil.cs b/cs/src/Ice/StringUtil.cs index 7013b6fdf80..e4a62b363eb 100644 --- a/cs/src/Ice/StringUtil.cs +++ b/cs/src/Ice/StringUtil.cs @@ -10,7 +10,7 @@ using System.Text; using System.Diagnostics; -namespace IceUtil +namespace IceUtilInternal { public sealed class StringUtil diff --git a/cs/src/Ice/ThreadPool.cs b/cs/src/Ice/ThreadPool.cs index d816984fd76..197bca79a2c 100644 --- a/cs/src/Ice/ThreadPool.cs +++ b/cs/src/Ice/ThreadPool.cs @@ -28,7 +28,7 @@ namespace IceInternal using System.Diagnostics; using System.Net.Sockets; using System.Threading; - using IceUtil; + using IceUtilInternal; public delegate void ThreadPoolExecuteDelegate(ThreadPool threadPool); @@ -940,7 +940,7 @@ namespace IceInternal private Socket _fdIntrRead; private Socket _fdIntrWrite; - private IceUtil.LinkedList _changes = new IceUtil.LinkedList(); + private IceUtilInternal.LinkedList _changes = new IceUtilInternal.LinkedList(); private LinkedList<ThreadPoolExecuteDelegate> _workItems = new LinkedList<ThreadPoolExecuteDelegate>(); private Hashtable _handlerMap = new Hashtable(); diff --git a/cs/src/Ice/TraceUtil.cs b/cs/src/Ice/TraceUtil.cs index cbe38904327..e2d1c74782d 100644 --- a/cs/src/Ice/TraceUtil.cs +++ b/cs/src/Ice/TraceUtil.cs @@ -12,7 +12,7 @@ namespace IceInternal using System.Collections; using System.Diagnostics; - using IceUtil; + using IceUtilInternal; sealed class TraceUtil { @@ -164,7 +164,7 @@ namespace IceInternal s.Write("\nfacet = "); if(facet.Length > 0) { - s.Write(IceUtil.StringUtil.escapeString(facet[0], "")); + s.Write(IceUtilInternal.StringUtil.escapeString(facet[0], "")); } string operation = str.readString(); diff --git a/cs/src/Ice/UnknownEndpointI.cs b/cs/src/Ice/UnknownEndpointI.cs index 704ac6fc7ae..a462cc10e5d 100644 --- a/cs/src/Ice/UnknownEndpointI.cs +++ b/cs/src/Ice/UnknownEndpointI.cs @@ -81,12 +81,12 @@ namespace IceInternal } for(int j = 0; j < argument.Length; ++j) { - if(!IceUtil.Base64.isBase64(argument[j])) + if(!IceUtilInternal.Base64.isBase64(argument[j])) { throw new Ice.EndpointParseException("opaque " + str); } } - _rawBytes = IceUtil.Base64.decode(argument); + _rawBytes = IceUtilInternal.Base64.decode(argument); ++vopt; break; } @@ -132,7 +132,7 @@ namespace IceInternal // public override string ice_toString_() { - string val = IceUtil.Base64.encode(_rawBytes); + string val = IceUtilInternal.Base64.encode(_rawBytes); return "opaque -t " + _type + " -v " + val; } diff --git a/cs/src/Ice/Util.cs b/cs/src/Ice/Util.cs index b6bbe99a71d..294aa9f31e1 100644 --- a/cs/src/Ice/Util.cs +++ b/cs/src/Ice/Util.cs @@ -170,7 +170,7 @@ namespace Ice if(slash == -1) { - if(!IceUtil.StringUtil.unescapeString(s, 0, s.Length, out ident.name)) + if(!IceUtilInternal.StringUtil.unescapeString(s, 0, s.Length, out ident.name)) { IdentityParseException ex = new IdentityParseException(); ex.str = s; @@ -180,7 +180,7 @@ namespace Ice } else { - if(!IceUtil.StringUtil.unescapeString(s, 0, slash, out ident.category)) + if(!IceUtilInternal.StringUtil.unescapeString(s, 0, slash, out ident.category)) { IdentityParseException ex = new IdentityParseException(); ex.str = s; @@ -188,7 +188,7 @@ namespace Ice } if(slash + 1 < s.Length) { - if(!IceUtil.StringUtil.unescapeString(s, slash + 1, s.Length, out ident.name)) + if(!IceUtilInternal.StringUtil.unescapeString(s, slash + 1, s.Length, out ident.name)) { IdentityParseException ex = new IdentityParseException(); ex.str = s; @@ -208,11 +208,11 @@ namespace Ice { if(ident.category.Length == 0) { - return IceUtil.StringUtil.escapeString(ident.name, "/"); + return IceUtilInternal.StringUtil.escapeString(ident.name, "/"); } else { - return IceUtil.StringUtil.escapeString(ident.category, "/") + '/' + IceUtil.StringUtil.escapeString(ident.name, "/"); + return IceUtilInternal.StringUtil.escapeString(ident.category, "/") + '/' + IceUtilInternal.StringUtil.escapeString(ident.name, "/"); } } diff --git a/cs/src/Ice/ValueWriter.cs b/cs/src/Ice/ValueWriter.cs index 625cfbf18a9..1ec632a3131 100644 --- a/cs/src/Ice/ValueWriter.cs +++ b/cs/src/Ice/ValueWriter.cs @@ -13,7 +13,7 @@ namespace IceInternal using System.Collections; using System.Diagnostics; using System.Reflection; - using IceUtil; + using IceUtilInternal; public sealed class ValueWriter { diff --git a/cs/src/Ice/XMLOutput.cs b/cs/src/Ice/XMLOutput.cs index 7a57537f451..b4770513c1f 100644 --- a/cs/src/Ice/XMLOutput.cs +++ b/cs/src/Ice/XMLOutput.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -namespace IceUtil +namespace IceUtilInternal { using System.Collections; diff --git a/cs/src/IceBox/ServiceManagerI.cs b/cs/src/IceBox/ServiceManagerI.cs index 4b0200edd88..1047cb1ddfc 100644 --- a/cs/src/IceBox/ServiceManagerI.cs +++ b/cs/src/IceBox/ServiceManagerI.cs @@ -458,9 +458,9 @@ class ServiceManagerI : ServiceManagerDisp_ entryPoint = value.Substring(0, pos); try { - args = IceUtil.Options.split(value.Substring(pos)); + args = IceUtilInternal.Options.split(value.Substring(pos)); } - catch(IceUtil.Options.BadQuote ex) + catch(IceUtilInternal.Options.BadQuote ex) { FailureException e = new FailureException(); e.reason = "ServiceManager: invalid arguments for service `" + name + "':\n" + ex.ToString(); diff --git a/cs/test/Ice/background/BackgroundControllerI.cs b/cs/test/Ice/background/BackgroundControllerI.cs index 296cd548f93..9c2493bafe0 100644 --- a/cs/test/Ice/background/BackgroundControllerI.cs +++ b/cs/test/Ice/background/BackgroundControllerI.cs @@ -88,6 +88,6 @@ internal class BackgroundControllerI : BackgroundControllerDisp_ } private Ice.ObjectAdapter _adapter; - private IceUtil.Set _pausedCalls = new IceUtil.Set(); + private IceUtilInternal.Set _pausedCalls = new IceUtilInternal.Set(); private Configuration _configuration; } diff --git a/cs/test/Ice/binding/AllTests.cs b/cs/test/Ice/binding/AllTests.cs index 99621da6e30..a8efac13bb7 100755 --- a/cs/test/Ice/binding/AllTests.cs +++ b/cs/test/Ice/binding/AllTests.cs @@ -153,7 +153,7 @@ public class AllTests // Ensure that when a connection is opened it's reused for new // proxies and that all endpoints are eventually tried. // - IceUtil.Set names = new IceUtil.Set(); + IceUtilInternal.Set names = new IceUtilInternal.Set(); names.Add("Adapter11"); names.Add("Adapter12"); names.Add("Adapter13"); @@ -245,7 +245,7 @@ public class AllTests // Ensure that when a connection is opened it's reused for new // proxies and that all endpoints are eventually tried. // - IceUtil.Set names = new IceUtil.Set(); + IceUtilInternal.Set names = new IceUtilInternal.Set(); names.Add("AdapterAMI11"); names.Add("AdapterAMI12"); names.Add("AdapterAMI13"); @@ -336,7 +336,7 @@ public class AllTests TestIntfPrx obj = createTestIntfPrx(adapters); test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random); - IceUtil.Set names = new IceUtil.Set(); + IceUtilInternal.Set names = new IceUtilInternal.Set(); names.Add("Adapter21"); names.Add("Adapter22"); names.Add("Adapter23"); @@ -460,7 +460,7 @@ public class AllTests TestIntfPrx obj = TestIntfPrxHelper.uncheckedCast(createTestIntfPrx(adapters).ice_connectionCached(false)); test(!obj.ice_isConnectionCached()); - IceUtil.Set names = new IceUtil.Set(); + IceUtilInternal.Set names = new IceUtilInternal.Set(); names.Add("Adapter51"); names.Add("Adapter52"); names.Add("Adapter53"); @@ -498,7 +498,7 @@ public class AllTests TestIntfPrx obj = TestIntfPrxHelper.uncheckedCast(createTestIntfPrx(adapters).ice_connectionCached(false)); test(!obj.ice_isConnectionCached()); - IceUtil.Set names = new IceUtil.Set(); + IceUtilInternal.Set names = new IceUtilInternal.Set(); names.Add("AdapterAMI51"); names.Add("AdapterAMI52"); names.Add("AdapterAMI53"); diff --git a/cs/test/IceBox/configuration/AllTests.cs b/cs/test/IceBox/configuration/AllTests.cs index eddeb7b4b3e..c97af9c91f5 100644 --- a/cs/test/IceBox/configuration/AllTests.cs +++ b/cs/test/IceBox/configuration/AllTests.cs @@ -40,7 +40,7 @@ public class AllTests test(service1.getProperty("Arg").Equals("1")); string[] args1 = {"-a", "--Arg=2"}; - test(IceUtil.Arrays.Equals(service1.getArgs(), args1)); + test(IceUtilInternal.Arrays.Equals(service1.getArgs(), args1)); test(service2.getProperty("Ice.ProgramName").Equals("Test")); test(service2.getProperty("Service").Equals("2")); @@ -48,7 +48,7 @@ public class AllTests test(service2.getProperty("IceBox.InheritProperties").Equals("1")); string[] args2 = {"--Service1.ArgProp=1"}; - test(IceUtil.Arrays.Equals(service2.getArgs(), args2)); + test(IceUtilInternal.Arrays.Equals(service2.getArgs(), args2)); Console.Out.WriteLine("ok"); @@ -68,7 +68,7 @@ public class AllTests test(service4.getProperty("Ice.Trace.Network").Equals("3")); string[] args4 = {"--Service3.Prop=2"}; - test(IceUtil.Arrays.Equals(service4.getArgs(), args4)); + test(IceUtilInternal.Arrays.Equals(service4.getArgs(), args4)); Console.Out.WriteLine("ok"); } diff --git a/cs/test/IceUtil/inputUtil/Client.cs b/cs/test/IceUtil/inputUtil/Client.cs index 04cbd77ff0e..e128c9f684b 100755 --- a/cs/test/IceUtil/inputUtil/Client.cs +++ b/cs/test/IceUtil/inputUtil/Client.cs @@ -30,59 +30,59 @@ public class Client try { - test(IceUtil.Options.split("").Length == 0); + test(IceUtilInternal.Options.split("").Length == 0); - args = IceUtil.Options.split("\"\""); + args = IceUtilInternal.Options.split("\"\""); test(args.Length == 1 && args[0].Equals("")); - args = IceUtil.Options.split("''"); + args = IceUtilInternal.Options.split("''"); test(args.Length == 1 && args[0].Equals("")); - args = IceUtil.Options.split("$''"); + args = IceUtilInternal.Options.split("$''"); test(args.Length == 1 && args[0].Equals("")); - args = IceUtil.Options.split("-a -b -c"); + args = IceUtilInternal.Options.split("-a -b -c"); test(args.Length == 3 && args[0].Equals("-a") && args[1].Equals("-b") && args[2].Equals("-c")); - args = IceUtil.Options.split("\"-a\" '-b' $'-c'"); + args = IceUtilInternal.Options.split("\"-a\" '-b' $'-c'"); test(args.Length == 3 && args[0].Equals("-a") && args[1].Equals("-b") && args[2].Equals("-c")); - args = IceUtil.Options.split(" '-b' \"-a\" $'-c' "); + args = IceUtilInternal.Options.split(" '-b' \"-a\" $'-c' "); test(args.Length == 3 && args[0].Equals("-b") && args[1].Equals("-a") && args[2].Equals("-c")); - args = IceUtil.Options.split(" $'-c' '-b' \"-a\" "); + args = IceUtilInternal.Options.split(" $'-c' '-b' \"-a\" "); test(args.Length == 3 && args[0].Equals("-c") && args[1].Equals("-b") && args[2].Equals("-a")); // Testing single quote - args = IceUtil.Options.split("-Dir='C:\\\\test\\\\file'"); // -Dir='C:\\test\\file' + args = IceUtilInternal.Options.split("-Dir='C:\\\\test\\\\file'"); // -Dir='C:\\test\\file' test(args.Length == 1 && args[0].Equals("-Dir=C:\\\\test\\\\file")); // -Dir=C:\\test\\file - args = IceUtil.Options.split("-Dir='C:\\test\\file'"); // -Dir='C:\test\file' + args = IceUtilInternal.Options.split("-Dir='C:\\test\\file'"); // -Dir='C:\test\file' test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir='C:\\test\\filewith\"quote'"); // -Dir='C:\test\filewith"quote' + args = IceUtilInternal.Options.split("-Dir='C:\\test\\filewith\"quote'"); // -Dir='C:\test\filewith"quote' test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\filewith\"quote")); // -Dir=C:\test\filewith"quote // Testing double quote - args = IceUtil.Options.split("-Dir=\"C:\\\\test\\\\file\""); // -Dir="C:\\test\\file" + args = IceUtilInternal.Options.split("-Dir=\"C:\\\\test\\\\file\""); // -Dir="C:\\test\\file" test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=\"C:\\test\\file\""); // -Dir="C:\test\file" + args = IceUtilInternal.Options.split("-Dir=\"C:\\test\\file\""); // -Dir="C:\test\file" test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=\"C:\\test\\filewith\\\"quote\""); // -Dir="C:\test\filewith\"quote" + args = IceUtilInternal.Options.split("-Dir=\"C:\\test\\filewith\\\"quote\""); // -Dir="C:\test\filewith\"quote" test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\filewith\"quote")); // -Dir=C:\test\filewith"quote // Testing ANSI quote - args = IceUtil.Options.split("-Dir=$'C:\\\\test\\\\file'"); // -Dir=$'C:\\test\\file' + args = IceUtilInternal.Options.split("-Dir=$'C:\\\\test\\\\file'"); // -Dir=$'C:\\test\\file' test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=$'C:\\oest\\oile'"); // -Dir='C:\oest\oile' + args = IceUtilInternal.Options.split("-Dir=$'C:\\oest\\oile'"); // -Dir='C:\oest\oile' test(args.Length == 1 && args[0].Equals("-Dir=C:\\oest\\oile")); // -Dir=C:\oest\oile - args = IceUtil.Options.split("-Dir=$'C:\\oest\\oilewith\"quote'"); // -Dir=$'C:\oest\oilewith"quote' + args = IceUtilInternal.Options.split("-Dir=$'C:\\oest\\oilewith\"quote'"); // -Dir=$'C:\oest\oilewith"quote' test(args.Length == 1 && args[0].Equals("-Dir=C:\\oest\\oilewith\"quote")); // -Dir=C:\oest\oilewith"quote - args = IceUtil.Options.split("-Dir=$'\\103\\072\\134\\164\\145\\163\\164\\134\\146\\151\\154\\145'"); + args = IceUtilInternal.Options.split("-Dir=$'\\103\\072\\134\\164\\145\\163\\164\\134\\146\\151\\154\\145'"); test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=$'\\x43\\x3A\\x5C\\x74\\x65\\x73\\x74\\x5C\\x66\\x69\\x6C\\x65'"); + args = IceUtilInternal.Options.split("-Dir=$'\\x43\\x3A\\x5C\\x74\\x65\\x73\\x74\\x5C\\x66\\x69\\x6C\\x65'"); test(args.Length == 1 && args[0].Equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=$'\\cM\\c_'"); // Control characters + args = IceUtilInternal.Options.split("-Dir=$'\\cM\\c_'"); // Control characters test(args.Length == 1 && args[0].Equals("-Dir=\x0D\x1F")); - args = IceUtil.Options.split("-Dir=$'C:\\\\\\146\\x66\\cMi'"); // -Dir=$'C:\\\146\x66i\cMi' + args = IceUtilInternal.Options.split("-Dir=$'C:\\\\\\146\\x66\\cMi'"); // -Dir=$'C:\\\146\x66i\cMi' test(args.Length == 1 && args[0].Equals("-Dir=C:\\ff\x0Di")); - args = IceUtil.Options.split("-Dir=$'C:\\\\\\cM\\x66\\146i'"); // -Dir=$'C:\\\cM\x66\146i' + args = IceUtilInternal.Options.split("-Dir=$'C:\\\\\\cM\\x66\\146i'"); // -Dir=$'C:\\\cM\x66\146i' test(args.Length == 1 && args[0].Equals("-Dir=C:\\\x000Dffi")); } - catch(IceUtil.Options.BadQuote) + catch(IceUtilInternal.Options.BadQuote) { test(false); } @@ -98,10 +98,10 @@ public class Client { try { - IceUtil.Options.split(badQuoteCommands[i]); + IceUtilInternal.Options.split(badQuoteCommands[i]); test(false); } - catch(IceUtil.Options.BadQuote) + catch(IceUtilInternal.Options.BadQuote) { } } |