[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/Remoting/Meta
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/Remoting/Metadata SoapAttribute.cs, 1.1, 1.2 SoapFieldAttribute.cs, 1.1, 1.2 SoapMethodAttribute.cs, 1.1, 1.2 SoapOption.cs, 1.1, 1.2 SoapParameterAttribute.cs, 1.1, 1.2 SoapTypeAttribute.cs, 1.2, 1.3 XmlFieldOrderOption.cs, 1.1, 1.2 |
|
Date: |
Tue, 05 Aug 2003 22:07:56 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata
In directory
subversions:/tmp/cvs-serv27592/runtime/System/Runtime/Remoting/Metadata
Modified Files:
SoapAttribute.cs SoapFieldAttribute.cs SoapMethodAttribute.cs
SoapOption.cs SoapParameterAttribute.cs SoapTypeAttribute.cs
XmlFieldOrderOption.cs
Log Message:
Outstanding TODO's with the SOAP-related routines in runtime.
Index: SoapAttribute.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/SoapAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SoapAttribute.cs 17 Apr 2003 10:36:10 -0000 1.1
--- SoapAttribute.cs 6 Aug 2003 02:07:53 -0000 1.2
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
public class SoapAttribute : Attribute
--- 23,27 ----
{
! #if CONFIG_SERIALIZATION
public class SoapAttribute : Attribute
***************
*** 72,78 ****
}
}; // class SoapAttribute
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 72,84 ----
}
+ // Set the initial "ReflectInfo" value.
+ internal void SetReflectInfo(Object reflectInfo)
+ {
+ ReflectInfo = reflectInfo;
+ }
+
}; // class SoapAttribute
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
Index: SoapFieldAttribute.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/SoapFieldAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SoapFieldAttribute.cs 17 Apr 2003 10:36:10 -0000 1.1
--- SoapFieldAttribute.cs 6 Aug 2003 02:07:53 -0000 1.2
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
[AttributeUsage(AttributeTargets.Field)]
--- 23,29 ----
{
! #if CONFIG_SERIALIZATION
!
! using System.Reflection;
[AttributeUsage(AttributeTargets.Field)]
***************
*** 51,54 ****
--- 53,63 ----
get
{
+ if(xmlElementName == null)
+ {
+ if(ReflectInfo != null)
+ {
+ xmlElementName =
((FieldInfo)ReflectInfo).Name;
+ }
+ }
return xmlElementName;
}
***************
*** 68,72 ****
}; // class SoapFieldAttribute
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 77,81 ----
}; // class SoapFieldAttribute
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
Index: SoapMethodAttribute.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/SoapMethodAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SoapMethodAttribute.cs 17 Apr 2003 10:36:10 -0000 1.1
--- SoapMethodAttribute.cs 6 Aug 2003 02:07:53 -0000 1.2
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
[AttributeUsage(AttributeTargets.Method)]
--- 23,29 ----
{
! #if CONFIG_SERIALIZATION
!
! using System.Reflection;
[AttributeUsage(AttributeTargets.Method)]
***************
*** 38,47 ****
// Get or set the attribute's properties.
- [TODO]
public String ResponseXmlElementName
{
get
{
! // TODO: default element name handling.
return responseXmlElementName;
}
--- 40,55 ----
// Get or set the attribute's properties.
public String ResponseXmlElementName
{
get
{
! if(responseXmlElementName == null)
! {
! if(ReflectInfo != null)
! {
! responseXmlElementName =
!
((MemberInfo)ReflectInfo).Name + "Response";
! }
! }
return responseXmlElementName;
}
***************
*** 75,79 ****
if(returnXmlElementName == null)
{
! return "__return";
}
return returnXmlElementName;
--- 83,87 ----
if(returnXmlElementName == null)
{
! return "return";
}
return returnXmlElementName;
***************
*** 84,93 ****
}
}
- [TODO]
public String SoapAction
{
get
{
! // TODO: default action handling
return soapAction;
}
--- 92,104 ----
}
}
public String SoapAction
{
get
{
! if(soapAction == null)
! {
! soapAction =
GetReflectNamespace() + "#" +
!
((MemberInfo)ReflectInfo).Name;
! }
return soapAction;
}
***************
*** 113,117 ****
get
{
! // TODO: default namespace handling
return ProtXmlNamespace;
}
--- 124,131 ----
get
{
! if(ProtXmlNamespace == null)
! {
! ProtXmlNamespace =
GetReflectNamespace();
! }
return ProtXmlNamespace;
}
***************
*** 122,128 ****
}
}; // class SoapMethodAttribute
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 136,153 ----
}
+ // Get the namespace corresponding to the reflected member.
+ private String GetReflectNamespace()
+ {
+ if(ReflectInfo != null)
+ {
+ Type type =
((MemberInfo)ReflectInfo).DeclaringType;
+ return
SoapTypeAttribute.GetNamespaceForType(type);
+ }
+ return null;
+ }
+
}; // class SoapMethodAttribute
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
Index: SoapOption.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/SoapOption.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SoapOption.cs 17 Apr 2003 10:36:10 -0000 1.1
--- SoapOption.cs 6 Aug 2003 02:07:53 -0000 1.2
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
[Serializable]
--- 23,27 ----
{
! #if CONFIG_SERIALIZATION
[Serializable]
***************
*** 38,42 ****
}; // enum SoapOption
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 38,42 ----
}; // enum SoapOption
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
Index: SoapParameterAttribute.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/SoapParameterAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SoapParameterAttribute.cs 17 Apr 2003 10:36:10 -0000 1.1
--- SoapParameterAttribute.cs 6 Aug 2003 02:07:53 -0000 1.2
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
[AttributeUsage(AttributeTargets.Parameter)]
--- 23,27 ----
{
! #if CONFIG_SERIALIZATION
[AttributeUsage(AttributeTargets.Parameter)]
***************
*** 33,37 ****
}; // class SoapParameterAttribute
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 33,37 ----
}; // class SoapParameterAttribute
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
Index: SoapTypeAttribute.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/SoapTypeAttribute.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SoapTypeAttribute.cs 23 Apr 2003 05:39:50 -0000 1.2
--- SoapTypeAttribute.cs 6 Aug 2003 02:07:53 -0000 1.3
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
[AttributeUsage(AttributeTargets.Class |
--- 23,30 ----
{
! #if CONFIG_SERIALIZATION
!
! using System.Reflection;
! using System.Text;
[AttributeUsage(AttributeTargets.Class |
***************
*** 69,73 ****
get
{
! // TODO: default element name handling
return xmlElementName;
}
--- 72,82 ----
get
{
! if(xmlElementName == null)
! {
! if(ReflectInfo != null)
! {
! xmlElementName =
((Type)ReflectInfo).Name;
! }
! }
return xmlElementName;
}
***************
*** 92,96 ****
get
{
! // TODO: default namespace handling
return ProtXmlNamespace;
}
--- 101,108 ----
get
{
! if(ProtXmlNamespace == null)
! {
! ProtXmlNamespace =
XmlTypeNamespace;
! }
return ProtXmlNamespace;
}
***************
*** 104,108 ****
get
{
! // TODO: default type name handling
return xmlTypeName;
}
--- 116,126 ----
get
{
! if(xmlTypeName == null)
! {
! if(ReflectInfo != null)
! {
! xmlTypeName =
((Type)ReflectInfo).Name;
! }
! }
return xmlTypeName;
}
***************
*** 116,120 ****
get
{
! // TODO: default type namespace handling
return xmlTypeNamespace;
}
--- 134,145 ----
get
{
! if(xmlTypeNamespace == null)
! {
! if(ReflectInfo != null)
! {
! xmlTypeNamespace =
GetNamespaceForType
!
((Type)ReflectInfo);
! }
! }
return xmlTypeNamespace;
}
***************
*** 125,131 ****
}
}; // class SoapTypeAttribute
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 150,185 ----
}
+ // Get the namespace corresponding to a particular type.
+ internal static String GetNamespaceForType(Type type)
+ {
+ StringBuilder builder = new StringBuilder();
+ if(type.Assembly ==
Assembly.GetExecutingAssembly())
+ {
+
builder.Append(SoapServices.XmlNsForClrTypeWithNs);
+ builder.Append(type.FullName);
+ }
+ else
+ {
+ builder.Append
+
(SoapServices.XmlNsForClrTypeWithNsAndAssembly);
+ builder.Append(type.FullName);
+ builder.Append('/');
+ String assembly =
type.Assembly.FullName;
+ int index = assembly.IndexOf(',');
+ if(index != -1)
+ {
+ builder.Append(assembly, 0,
index);
+ }
+ else
+ {
+ builder.Append(assembly);
+ }
+ }
+ return builder.ToString();
+ }
+
}; // class SoapTypeAttribute
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
Index: XmlFieldOrderOption.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/Remoting/Metadata/XmlFieldOrderOption.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** XmlFieldOrderOption.cs 17 Apr 2003 10:36:10 -0000 1.1
--- XmlFieldOrderOption.cs 6 Aug 2003 02:07:53 -0000 1.2
***************
*** 23,27 ****
{
! #if CONFIG_REMOTING
[Serializable]
--- 23,27 ----
{
! #if CONFIG_SERIALIZATION
[Serializable]
***************
*** 34,38 ****
}; // enum XmlFieldOrderOption
! #endif // CONFIG_REMOTING
}; // namespace System.Runtime.Remoting.Metadata
--- 34,38 ----
}; // enum XmlFieldOrderOption
! #endif // CONFIG_SERIALIZATION
}; // namespace System.Runtime.Remoting.Metadata
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/Remoting/Metadata SoapAttribute.cs, 1.1, 1.2 SoapFieldAttribute.cs, 1.1, 1.2 SoapMethodAttribute.cs, 1.1, 1.2 SoapOption.cs, 1.1, 1.2 SoapParameterAttribute.cs, 1.1, 1.2 SoapTypeAttribute.cs, 1.2, 1.3 XmlFieldOrderOption.cs, 1.1, 1.2,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/Remoting/Metadata/W3cXsd2001 ISoapXsd.cs, 1.1, 1.2 SoapAnyUri.cs, 1.1, 1.2 SoapBase64Binary.cs, 1.1, 1.2 SoapDate.cs, 1.2, 1.3 SoapDateTime.cs, 1.1, 1.2 SoapDay.cs, 1.1, 1.2 SoapDuration.cs, 1.1, 1.2 SoapEntities.cs, 1.1, 1.2 SoapEntity.cs, 1.1, 1.2 SoapHexBinary.cs, 1.1, 1.2 SoapId.cs, 1.1, 1.2 SoapIdref.cs, 1.1, 1.2 SoapIdrefs.cs, 1.1, 1.2 SoapInteger.cs, 1.1, 1.2 SoapLanguage.cs, 1.1, 1.2 SoapMonth.cs, 1.1, 1.2 SoapMonthDay.cs, 1.1, 1.2 SoapName.cs, 1.1, 1.2 SoapNcName.cs, 1.1, 1.2 SoapNegativeInteger.cs, 1.1, 1.2 SoapNmtoken.cs, 1.1, 1.2 SoapNmtokens.cs, 1.1, 1.2 SoapNonNegativeInteger.cs, 1.1, 1.2 SoapNonPositiveInteger.cs, 1.1, 1.2 SoapNormalizedString.cs, 1.1, 1.2 SoapNotation.cs, 1.1, 1.2 SoapPositiveInteger.cs, 1.1, 1.2 SoapQName.cs, 1.1, 1.2 SoapTime.cs, 1.1, 1.2 SoapToken.cs, 1.1, 1.2 SoapYear.cs, 1.1, 1.2 SoapYearMonth.cs, 1.1, 1.2
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.1232,1.1233
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/Remoting/Metadata/W3cXsd2001 ISoapXsd.cs, 1.1, 1.2 SoapAnyUri.cs, 1.1, 1.2 SoapBase64Binary.cs, 1.1, 1.2 SoapDate.cs, 1.2, 1.3 SoapDateTime.cs, 1.1, 1.2 SoapDay.cs, 1.1, 1.2 SoapDuration.cs, 1.1, 1.2 SoapEntities.cs, 1.1, 1.2 SoapEntity.cs, 1.1, 1.2 SoapHexBinary.cs, 1.1, 1.2 SoapId.cs, 1.1, 1.2 SoapIdref.cs, 1.1, 1.2 SoapIdrefs.cs, 1.1, 1.2 SoapInteger.cs, 1.1, 1.2 SoapLanguage.cs, 1.1, 1.2 SoapMonth.cs, 1.1, 1.2 SoapMonthDay.cs, 1.1, 1.2 SoapName.cs, 1.1, 1.2 SoapNcName.cs, 1.1, 1.2 SoapNegativeInteger.cs, 1.1, 1.2 SoapNmtoken.cs, 1.1, 1.2 SoapNmtokens.cs, 1.1, 1.2 SoapNonNegativeInteger.cs, 1.1, 1.2 SoapNonPositiveInteger.cs, 1.1, 1.2 SoapNormalizedString.cs, 1.1, 1.2 SoapNotation.cs, 1.1, 1.2 SoapPositiveInteger.cs, 1.1, 1.2 SoapQName.cs, 1.1, 1.2 SoapTime.cs, 1.1, 1.2 SoapToken.cs, 1.1, 1.2 SoapYear.cs, 1.1, 1.2 SoapYearMonth.cs, 1.1, 1.2
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.1232,1.1233
- Index(es):