OASIS Mailing List ArchivesView the OASIS mailing list archive below
or browse/search using MarkMail.

 


Help: OASIS Mailing Lists Help | MarkMail Help

regrep message

[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]

Subject: Proposed resolution for Element substitution issue

Dear colleagues,

Oliver, Richard and I have been working on the following important issues:

In tomorrow's TC meeting Oliver and I would like to propose the following resolution of these issues:

1. Remove all global elements corresponding to all RegistryObjectType sub-types types (e.g. rim:ClassificationScheme, rim:ClassificationNode, ...)

2. Add global element:

<element name="RegistryObject" type="tns:RegistryObjectType"/>

3. Change the current definition of rim:RegistryObjectListType to:

 <complexType name="RegistryObjectListType">
    <sequence>
      <element ref="tns:RegistryObject" minOccurs="0" maxOccurs="unbounded" />
    </sequence>
  </complexType>

As a side effect of this change rest of schema to reuse rim:RegistryObjectList element instead of using similar local declarations.

4. Do not add element substitution

Rationale (Oliver's and mine) for proposed solution are:

(1) Avoids the problem of multiple representations (one with xsi:type and one without) for RegistryObjectType sub-types

(2) Enables an ebRIM format document to have any RegistryObjectType instance as a root element using new rim:RegistryObject element. This element will have only one representation that uses xsi:type

(3) Reuses the global definition added by (2)

(4) Provides better support for XML databinding tools which have more issues with element substitution and because database storage requires storing element QName in addition to other information for no functional reason.

I believe the schema is much better with above changes thanks to Richard's valuable input.

Richard, I believe you support (1), (2) and (3). I realize that (4) is not what you prefer. I hope you will consider this proposed resolution as a "half-full glass" and a result of serious consideration after spending considerable effort looking at implications of adding element substitution. I hope we will get beyond the element substitution issue and collaborate closely on the remaining work for RegRep 4 specifications.

Attached to this email are:
  • regrep-spec-cd5-SNAPSHOT.zip - Contains spec artifcats with proposed changes including resolution for an unrelated issue:
    Upgrade to XLink 1.1 (Richard please review the change for this)
  • diff-remove-global-elements.txt - Contains the changes to spec artifacts since last version in patch diff format
Lastly, I would like to suggest that each of us review the open issues to see which of them may have a potential for high impact in schema and WSDL. We should get these issues resolved at the highest priority so the schema and wsdl are stable with CD5.

Kathryn, for tomorrws meeting agenda may I propose the following:
  • Review of proposed resolution and (hopefully) approval of it
  • Discussion on high priority issues identified as potentially impacting schema and wsdl files
  • Discussion on a rapid release of CD5 with changes resulting from proposed resolution and any other bugs identified in time

Thank you.
-- 
Regards,
Farrukh

Web: http://www.wellfleetsoftware.com

regrep-spec-cd5-SNAPSHOT.zip

Index: src/main/resources/xml/minDB/SubmitObjectsRequest_StatusTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_StatusTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_StatusTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:StatusType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:StatusType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="StatusType"/>
@@ -58,5 +58,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_ErrorSeverityTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_ErrorSeverityTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_ErrorSeverityTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ErrorSeverityType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ErrorSeverityType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="ErrorSeverityType"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_OrganizationRoleScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_OrganizationRoleScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_OrganizationRoleScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:OrganizationRole" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:OrganizationRole" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="OrganizationRole"/>
@@ -59,5 +59,5 @@
         </rim:RegistryObject>
         <rim:RegistryObject xsi:type="rim:ClassificationType" lid="urn:oasis:names:tc:ebxml-regrep:classification:ControlBody" id="urn:oasis:names:tc:ebxml-regrep:classification:ControlBody" classifiedObject="urn:freebxml:registry:predefinedusers:registryoperator" classificationNode="urn:oasis:names:tc:ebxml-regrep:OrganizationRole:ControlBody">
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_NodeTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_NodeTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_NodeTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:NodeType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:NodeType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="NodeType"/>
@@ -49,5 +49,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_Queries.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_Queries.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_Queries.xml	(working copy)
@@ -24,7 +24,7 @@
             </rim:ValueListItem>
         </rim:ValueList>
     </rim:Slot>
-  <lcm:RegistryObjectList>
+  <rim:RegistryObjectList>
     <!--
     Parameterized Query to find an object by its id
     -->
@@ -713,5 +713,5 @@
       </rim:Parameter>
     </rim:RegistryObject>    
     
-  </lcm:RegistryObjectList>
+  </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_EmailTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_EmailTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_EmailTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:EmailType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:EmailType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
             <rim:Name>
                 <rim:LocalizedString value="EmailType"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_InvocationModelScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_InvocationModelScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_InvocationModelScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:InvocationModel" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:InvocationModel" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="InvocationModel"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_CollectionTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_CollectionTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_CollectionTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:CollectionType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:CollectionType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
             <rim:Name>
                 <rim:LocalizedString value="CollectionType"/>
@@ -58,5 +58,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_DeletionScopeTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_DeletionScopeTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_DeletionScopeTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:DeletionScopeType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:DeletionScopeType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="DeletionScopeType"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_ServiceTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_ServiceTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_ServiceTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ServiceType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ServiceType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="ServiceType"/>
@@ -26,5 +26,5 @@
             </rim:Description>
             
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_ResponseStatusTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_ResponseStatusTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_ResponseStatusTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ResponseStatusType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ResponseStatusType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="ResponseStatusType"/>
@@ -57,5 +57,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_StabilityTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_StabilityTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_StabilityTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:StabilityType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:StabilityType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="StabilityType"/>
@@ -49,5 +49,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_QueryLangScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_QueryLangScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_QueryLangScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:QueryLanguage" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:QueryLanguage" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="QueryLanguage"/>
@@ -50,5 +50,5 @@
                 </rim:Name>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_ObjectTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_ObjectTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_ObjectTypeScheme.xml	(working copy)
@@ -15,7 +15,7 @@
             </rim:ValueListItem>
         </rim:ValueList>
     </rim:Slot>
-  <lcm:RegistryObjectList>
+  <rim:RegistryObjectList>
     <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ObjectType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ObjectType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
       <rim:Name>
         <rim:LocalizedString value="ObjectType"/>
@@ -300,5 +300,5 @@
         </rim:ClassificationNode>
       </rim:ClassificationNode>
     </rim:RegistryObject>
-  </lcm:RegistryObjectList>
+  </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_PostalAddressTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_PostalAddressTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_PostalAddressTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:PostalAddressType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:PostalAddressType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
             <rim:Name>
                 <rim:LocalizedString value="PostalAddressType"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_PhoneTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_PhoneTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_PhoneTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:PhoneType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:PhoneType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
             <rim:Name>
                 <rim:LocalizedString value="PhoneType"/>
@@ -65,5 +65,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_DataTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_DataTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_DataTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:DataType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:DataType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
             <rim:Name>
                 <rim:LocalizedString value="DataType"/>
@@ -115,5 +115,5 @@
             </rim:ClassificationNode>    
         </rim:RegistryObject>
         
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_SubjectGroupScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_SubjectGroupScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_SubjectGroupScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:SubjectGroup" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:SubjectGroup" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="SubjectGroup"/>
@@ -25,5 +25,5 @@
                 <rim:LocalizedString xml:lang="en-US" value="SubjectGroup.desc"/>
             </rim:Description>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_AssociationTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_AssociationTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_AssociationTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:AssociationType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:AssociationType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode">
             <rim:Name>
                 <rim:LocalizedString value="AssociationType"/>
@@ -228,5 +228,5 @@
                 </rim:Name>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_ErrorHandlingModelScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_ErrorHandlingModelScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_ErrorHandlingModelScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ErrorHandlingModel" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ErrorHandlingModel" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="ErrorHandlingModel"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_ActionTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_ActionTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_ActionTypeScheme.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Header: /cvsroot/ebxmlrr/omar/misc/samples/minDB/SubmitObjectsRequest_ActionTypeScheme.xml,v 1.9 2007/05/25 17:18:53 farrukh_najmi Exp $-->
 <SubmitObjectsRequest id="urn:oasis:names:tc:ebxml-regrep:request:id" xmlns="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0" xmlns:lcm="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0" xmlns:query="urn:oasis:names:tc:ebxml-regrep:xsd:query:4.0" xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xlink="http://www.w3.org/1999/xlink"; xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0  ../../xsd/lcm.xsd">
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ActionType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ActionType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="ActionType"/>
@@ -139,5 +139,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_Config.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_Config.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_Config.xml	(working copy)
@@ -11,7 +11,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"; 
     xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0  ../../xsd/lcm.xsd">
         
-    <lcm:RegistryObjectList>                
+    <rim:RegistryObjectList>
         <!--Root folder with locator '/' -->
         <rim:RegistryObject xsi:type="rim:RegistryPackageType" lid="urn:oasis:names:tc:ebxml-regrep:RegistryPackage:registry" id="urn:oasis:names:tc:ebxml-regrep:RegistryPackage:registry">
             <rim:Name>
@@ -202,5 +202,5 @@
                 </rim:RegistryObject>
             </rim:RegistryObjectList>
         </rim:RegistryObject>        
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_NotificationOptionTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_NotificationOptionTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_NotificationOptionTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:NotificationOptionType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:NotificationOptionType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="NotificationOptionType"/>
@@ -41,5 +41,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_SubjectRoleScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_SubjectRoleScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_SubjectRoleScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:SubjectRole" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:SubjectRole" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="Subject Role"/>
@@ -76,5 +76,5 @@
                 </rim:Description>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_RegistrationProcedures.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_RegistrationProcedures.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_RegistrationProcedures.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
 
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <!-- StatusType extensions -->
         <rim:RegistryObject xsi:type="rim:ClassificationNodeType" lid="urn:oasis:names:tc:ebxml-regrep:StatusType:Proposed" code="Proposed" id="urn:oasis:names:tc:ebxml-regrep:StatusType:Proposed" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationNode" parent="urn:oasis:names:tc:ebxml-regrep:classificationScheme:StatusType">
             <rim:Name>
@@ -69,5 +69,5 @@
             </rim:Description>
         </rim:RegistryObject>
 
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_CMSScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_CMSScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_CMSScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ContentManagementService" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:ContentManagementService" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <rim:Name>
                 <rim:LocalizedString xml:lang="en-US" value="ContentManagementService"/>
@@ -40,5 +40,5 @@
                 </rim:Name>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/minDB/SubmitObjectsRequest_EventTypeScheme.xml
===================================================================
--- src/main/resources/xml/minDB/SubmitObjectsRequest_EventTypeScheme.xml	(revision 2284)
+++ src/main/resources/xml/minDB/SubmitObjectsRequest_EventTypeScheme.xml	(working copy)
@@ -16,7 +16,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ClassificationSchemeType" lid="urn:oasis:names:tc:ebxml-regrep:classificationScheme:EventType" id="urn:oasis:names:tc:ebxml-regrep:classificationScheme:EventType" isInternal="true" nodeType="urn:oasis:names:tc:ebxml-regrep:NodeType:UniqueCode" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme">
             <!-- Need to sync with latest specs ?? -->
             <rim:Name>
@@ -60,5 +60,5 @@
                 </rim:ClassificationNode>
             </rim:ClassificationNode>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/demoDB/SubmitObjectsRequest_TestData1.xml
===================================================================
--- src/main/resources/xml/demoDB/SubmitObjectsRequest_TestData1.xml	(revision 2284)
+++ src/main/resources/xml/demoDB/SubmitObjectsRequest_TestData1.xml	(working copy)
@@ -24,7 +24,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:RegistryPackageType" lid="urn:freebxml:registry:demoDB:files:home" id="urn:freebxml:registry:demoDB:files:home">
             <rim:Name>
                 <rim:LocalizedString value="home"/>
@@ -42,17 +42,17 @@
                             <rim:Name>
                                 <rim:LocalizedString value="najmi"/>
                             </rim:Name>
-                            <!--lcm:RegistryObjectList>
+                            <!--rim:RegistryObjectList>
                                 <rim:RegistryObject xsi:type="rim:ExtrinsicObjectType" lid="urn:freebxml:registry:demoDB:files:home:najmi:photos:wellfleet.jpg" id="urn:freebxml:registry:demoDB:files:home:najmi:photos:wellfleet.jpg">
                                     <rim:Name>
                                         <rim:LocalizedString value="wellfleet"/>
                                     </rim:Name>
                                 </rim:RegistryObject>
-                            </lcm:RegistryObjectList-->
+                            </rim:RegistryObjectList-->
                         </rim:RegistryObject>
                     </rim:RegistryObjectList>
                 </rim:RegistryObject>
             </rim:RegistryObjectList>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
Index: src/main/resources/xml/demoDB/OntologyExamples-rim.xml
===================================================================
--- src/main/resources/xml/demoDB/OntologyExamples-rim.xml	(revision 2284)
+++ src/main/resources/xml/demoDB/OntologyExamples-rim.xml	(working copy)
@@ -11,7 +11,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"; 
     xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0  ../../xsd/lcm.xsd"
     >
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:ExtrinsicObjectType" 
             lid="urn:test:ontology:pizza.owl" id="urn:test:ontology:pizza.owl"
             mimeType="application/rdf+xml"
@@ -63,6 +63,6 @@
             <rim:RepositoryItemRef xlink:role="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExtrinsicObject:import"
                 xlink:href="http://owl.man.ac.uk/2006/07/sssw/people.owl"/>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
 
Index: src/main/resources/xml/demoDB/WellfleetFederationConfig-rim.xml
===================================================================
--- src/main/resources/xml/demoDB/WellfleetFederationConfig-rim.xml	(revision 2284)
+++ src/main/resources/xml/demoDB/WellfleetFederationConfig-rim.xml	(working copy)
@@ -26,7 +26,7 @@
         </rim:ValueList>
     </rim:Slot>
     
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:OrganizationType" lid="urn:wellfleetsoftware:Organization:WellfleetSoftware" id="urn:wellfleetsoftware:Organization:WellfleetSoftware" primaryContact="urn:wellfleetsoftware:Person:farrukhNajmi">
             <rim:Name>
                 <rim:LocalizedString value="Wellfleet Software Corporation"/>
@@ -143,6 +143,6 @@
         </rim:RegistryObject>
         <!--HasComment assoc between Farrukh and Comment -->
         <rim:RegistryObject xsi:type="rim:AssociationType" type="urn:oasis:names:tc:ebxml-regrep:AssociationType:HasComment" lid="urn:test:commentAssoc2" id="urn:test:commentAssoc2" sourceObject="urn:test:comment:onFarrukh" targetObject="urn:test:comment2"/>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
 
Index: src/main/resources/xml/demoDB/RegisterConfig-rim.xml
===================================================================
--- src/main/resources/xml/demoDB/RegisterConfig-rim.xml	(revision 2284)
+++ src/main/resources/xml/demoDB/RegisterConfig-rim.xml	(working copy)
@@ -11,7 +11,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"; 
     xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0  ../../xsd/lcm.xsd"
     >
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <!-- Define Registers -->
         <rim:RegistryObject xsi:type="rim:RegisterType"
           lid="urn:test:Register:TestRegister1"
@@ -230,6 +230,6 @@
                 </rim:ValueList>
             </rim:Slot>
         </rim:RegistryObject>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
 
Index: src/main/resources/xml/examples/UpdateObjectsRequest-delete-element-invalid.xml
===================================================================
--- src/main/resources/xml/examples/UpdateObjectsRequest-delete-element-invalid.xml	(revision 2284)
+++ src/main/resources/xml/examples/UpdateObjectsRequest-delete-element-invalid.xml	(working copy)
@@ -24,7 +24,7 @@
             </rim:Name>
         </ValueHolder>
         <Selector xsi:type="rim:StringQueryExpressionType" queryLanguage="urn:oasis:names:tc:ebxml-regrep:QueryLanguage:XPath">
-            <rim:Value>./rim:Register/rim:Name</rim:Value>
+            <rim:Value>./rim:RegistryObject[@xsi:type=rim:RegisterType]/rim:Name</rim:Value>
         </Selector>
     </UpdateAction>
 </UpdateObjectsRequest>
Index: src/main/resources/xml/examples/immediate-subscription.xml
===================================================================
--- src/main/resources/xml/examples/immediate-subscription.xml	(revision 2284)
+++ src/main/resources/xml/examples/immediate-subscription.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Subscription 
+<RegistryObject xsi:type="rim:SubscriptionType"
   lid="urn:test:subscription:immediate1"
   id="urn:test:subscription:immediate1"
   xmlns:xlink="http://www.w3.org/1999/xlink"; 
@@ -37,4 +37,4 @@
             </ValueList>
         </Slot>
     </Selector>
-</Subscription>
+</RegistryObject>
Index: src/main/resources/xml/examples/periodic-subscription.xml
===================================================================
--- src/main/resources/xml/examples/periodic-subscription.xml	(revision 2284)
+++ src/main/resources/xml/examples/periodic-subscription.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Subscription 
+<RegistryObject xsi:type="rim:SubscriptionType"
   lid="urn:test:subscription:periodic1"
   id="urn:test:subscription:periodic1"
   notificationInterval="PT1M"
@@ -24,4 +24,4 @@
       </ValueList>
     </Slot>  
   </Selector>
-</Subscription>
+</RegistryObject>
Index: src/main/resources/xml/examples/UpdateObjectsRequest-update-attribute.xml
===================================================================
--- src/main/resources/xml/examples/UpdateObjectsRequest-update-attribute.xml	(revision 2284)
+++ src/main/resources/xml/examples/UpdateObjectsRequest-update-attribute.xml	(working copy)
@@ -21,7 +21,7 @@
             <rim:Value>image/png</rim:Value>
         </ValueHolder>
         <Selector xsi:type="rim:StringQueryExpressionType" queryLanguage="urn:oasis:names:tc:ebxml-regrep:QueryLanguage:XPath">
-            <rim:Value>./rim:ExtrinsicObject/@mimeType</rim:Value>
+            <rim:Value>./rim:RegistryObject[@xsi:type=rim:ExtrinsicObjectType]/@mimeType</rim:Value>
         </Selector>
     </UpdateAction>
 </UpdateObjectsRequest>
Index: src/main/resources/xml/examples/GenderScheme.xml
===================================================================
--- src/main/resources/xml/examples/GenderScheme.xml	(revision 2284)
+++ src/main/resources/xml/examples/GenderScheme.xml	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Header: /cvsroot/ebxmlrr/omar/misc/samples/minDB/SubmitObjectsRequest_AssociationTypeScheme.xml,v 1.18 2007/05/25 17:18:52 farrukh_najmi Exp $ -->
-<ClassificationScheme 
+<RegistryObject xsi:type="rim:ClassificationSchemeType"
   isInternal="true" 
   objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ClassificationScheme" 
   lid="urn:test:ClassificationScheme:GenderScheme" 
@@ -36,5 +36,5 @@
   </ClassificationNode>
 
 
-</ClassificationScheme>
+</RegistryObject>
     
Index: src/main/resources/xml/examples/SemanticAnnotation-ebrim.xml
===================================================================
--- src/main/resources/xml/examples/SemanticAnnotation-ebrim.xml	(revision 2284)
+++ src/main/resources/xml/examples/SemanticAnnotation-ebrim.xml	(working copy)
@@ -11,7 +11,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink";
     xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0  ../../xsd/lcm.xsd"
     >
-    <lcm:RegistryObjectList>
+    <rim:RegistryObjectList>
         <rim:RegistryObject xsi:type="rim:PersonType" lid="urn:wellfleetsoftware:Person:IdrisNajmi" id="urn:wellfleetsoftware:Person:IdrisNajmi">
             <rim:Name>
                 <rim:LocalizedString value="Najmi, Idris"/>
@@ -37,6 +37,6 @@
             lid="urn:wellfleetsoftware:Association:farrukhNajmi:has_father:IdrisNajmi"
             id="urn:wellfleetsoftware:Association:farrukhNajmi:has_father:IdrisNajmi"
             sourceObject="urn:wellfleetsoftware:Person:farrukhNajmi" targetObject="urn:wellfleetsoftware:Person:IdrisNajmi"/>
-    </lcm:RegistryObjectList>
+    </rim:RegistryObjectList>
 </SubmitObjectsRequest>
 
Index: src/main/resources/xml/examples/Person-rim.xml
===================================================================
--- src/main/resources/xml/examples/Person-rim.xml	(revision 2284)
+++ src/main/resources/xml/examples/Person-rim.xml	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Header: /cvsroot/ebxmlrr/omar/misc/samples/minDB/SubmitObjectsRequest_AssociationTypeScheme.xml,v 1.18 2007/05/25 17:18:52 farrukh_najmi Exp $ -->
-<Person 
+<RegistryObject xsi:type="rim:PersonType"
   objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Person"
   lid="urn:test:Person:Danyal" 
   id="urn:test:Person:Danyal"
@@ -22,5 +22,5 @@
   <rim:TelephoneNumber areaCode="781" countryCode="1" number="205-4733" type="FAX"/>
   <rim:EmailAddress address="danyal@home.com" />
   <PersonName firstName="Danyal" middleName="Idris" lastName="Najmi" />
-</Person>
+</RegistryObject>
     
Index: src/main/resources/xml/examples/UpdateObjectsRequest-delete-element.xml
===================================================================
--- src/main/resources/xml/examples/UpdateObjectsRequest-delete-element.xml	(revision 2284)
+++ src/main/resources/xml/examples/UpdateObjectsRequest-delete-element.xml	(working copy)
@@ -18,7 +18,7 @@
     </ObjectRefList>
     <UpdateAction mode="Delete">
         <Selector xsi:type="rim:StringQueryExpressionType" queryLanguage="urn:oasis:names:tc:ebxml-regrep:QueryLanguage:XPath">
-            <rim:Value>./rim:Register/rim:Name</rim:Value>
+            <rim:Value>./rim:RegistryObject[@xsi:type=rim:RegisterType]/rim:Name</rim:Value>
         </Selector>
     </UpdateAction>
 </UpdateObjectsRequest>
Index: src/main/resources/xml/examples/InvokeActionRequestExample1.xml
===================================================================
--- src/main/resources/xml/examples/InvokeActionRequestExample1.xml	(revision 2284)
+++ src/main/resources/xml/examples/InvokeActionRequestExample1.xml	(working copy)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Example of invoking deprecate action specifying a set of ids, a query id and query parameters all as parameters -->
-<InvokeActionRequest
-  id="urn:oasis:names:tc:ebxml-regrep:request:id" 
-  xmlns="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0" 
-  xmlns:lcm="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0" 
-  xmlns:query="urn:oasis:names:tc:ebxml-regrep:xsd:query:4.0" 
-  xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
-  xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
-  xmlns:xlink="http://www.w3.org/1999/xlink"; 
-  xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0  ../../xsd/lcm.xsd"
-  action="urn:oasis:names:tc:ebxml-regrep:ActionType:deprecate">
-
-    <!-- Specify ids of objects to deprecate -->
-    <rim:Slot name="urn:oasis:names:tc:ebxml-regrep:action:deprecate:param:ids">
-        <rim:ValueList>
-            <rim:ValueListItem xsi:type="rim:StringValueType">
-                <rim:Value>urn:acme:objects:1</rim:Value>
-            </rim:ValueListItem>
-            <rim:ValueListItem xsi:type="rim:StringValueType">
-                <rim:Value>urn:acme:objects:3</rim:Value>
-            </rim:ValueListItem>
-        </rim:ValueList>
-    </rim:Slot>
-
-    <!-- Specify the id of a query that will be used to match objects to deprecate -->
-    <rim:Slot name="urn:oasis:names:tc:ebxml-regrep:action:deprecate:param:queryId">
-        <rim:ValueList>
-            <rim:ValueListItem xsi:type="rim:StringValueType">
-                <rim:Value>urn:oasis:names:tc:ebxml-regrep:query:BasicQuery</rim:Value>
-            </rim:ValueListItem>
-        </rim:ValueList>
-    </rim:Slot>
-
-    <!-- Specify any additional slots as values for query parameters for query identified by queryId -->
-    <!-- name param for Basic Query -->
-    <rim:Slot name="name">
-        <rim:ValueList>
-            <rim:ValueListItem xsi:type="rim:StringValueType">
-                <rim:Value>%acme%</rim:Value>
-            </rim:ValueListItem>
-        </rim:ValueList>
-    </rim:Slot>
-
-</InvokeActionRequest>
Index: src/main/resources/xml/examples/ExtrinsicObjectWithRepositoryItem-rim.xml
===================================================================
--- src/main/resources/xml/examples/ExtrinsicObjectWithRepositoryItem-rim.xml	(revision 2284)
+++ src/main/resources/xml/examples/ExtrinsicObjectWithRepositoryItem-rim.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ExtrinsicObject lid="urn:test:sufisymbol.jpg" id="urn:test:sufisymbol.jpg"
+<RegistryObject xsi:type="rim:ExtrinsicObjectType" lid="urn:test:sufisymbol.jpg" id="urn:test:sufisymbol.jpg"
   xmlns="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0"
   xmlns:xlink="http://www.w3.org/1999/xlink";
   xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
@@ -13,4 +13,4 @@
     <rim:RepositoryItemRef
         xlink:role="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExtrinsicObject:import"
         xlink:href="http://www.freemasonrywatch.org/pics/sufisymbol.jpg"/>
-</ExtrinsicObject>
+</RegistryObject>
Index: src/main/resources/xml/examples/CatalogObjectsResponseExample1.xml
===================================================================
--- src/main/resources/xml/examples/CatalogObjectsResponseExample1.xml	(revision 2284)
+++ src/main/resources/xml/examples/CatalogObjectsResponseExample1.xml	(working copy)
@@ -11,7 +11,7 @@
   xmlns:xlink="http://www.w3.org/1999/xlink"; 
   xsi:schemaLocation="urn:oasis:names:tc:ebxml-regrep:xsd:spi:4.0  ../../xsd/spi.xsd">
     
-  <CatalogedObjects>
+  <rim:RegistryObjectList>
     <rim:RegistryObject xsi:type="rim:ExtrinsicObjectType" mimeType="text/xml" 
       status="urn:oasis:names:tc:ebxml-regrep:StatusType:Submitted" 
       objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExtrinsicObject:XML:WSDL" 
@@ -35,5 +35,5 @@
       </rim:Slot>
       <rim:RepositoryItem>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGRlZmluaXRpb25zIAogIHRhcmdldE5hbWVzcGFjZT0idXJuOmZkYzpsbC5taXQuZWR1OlNlcnZpY2U6V0NTLTAxIgogIHhtbG5zOndzZGw9Imh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzZGwvIgogIHhtbG5zOmh0dHA9Imh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzZGwvaHR0cC8iCiAgeG1sbnM6c29hcD0iaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3NkbC9zb2FwLyIKICB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIAogIHhtbG5zOmRmYz0iaHR0cDovL2RhdGFmZWQubmV0L3hzL3djcyIgCiAgeG1sbnM6d2NzPSJodHRwOi8vd3d3Lm9wZW5naXMubmV0L3djcyIgCiAgeG1sbnM9Imh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzZGwvIgogID4KICAgIAogIDx3c2RsOmltcG9ydCBuYW1lc3BhY2U9Imh0dHA6Ly9kYXRhZmVkLm5ldC94cy93Y3MiCiAgICAgICAgICAgICAgICBsb2NhdGlvbj0iaHR0cDovL3dlYmFwcHMuZGF0YWZlZC5uZXQvV0NTLmFzbXg/V1NETCIvPgoKICA8IS0tIAogICAgQSBXU0RMIDEuMSBzZXJ2aWNlIGVsZW1lbnQgY29udGFpbnMgYSBncm91cCBvZiBvbmUgb3IgbW9yZSBlbmRwb2ludHMgKHBvcnRzKS4gCiAgICBUaGUgZWJYTUwgcmVncmVwIDQuMCBTZXJ2aWNlIG9iamVjdCBhbHNvIHJlcHJlc2VudHMgYSBncm91cCBvZiBlbmRwb2ludHMgZm9yIAogICAgYSBwYXJ0aWN1bGFyIHNlcnZpY2UgaW5zdGFuY2UuIAoKICAgIFdoZW4gY2F0YWxvZ2VkIGluIGFuIGViWE1MIHJlZ3JlcCwgdGhlIGlkIGZvciB0aGUgZWJYTUwgU2VydmljZSBvYmplY3QgY29ycmVzcG9uZGluZwogICAgdG8gdGhlIHNlcnZpY2UgZWxlbWVudCBiZWxvdyB1c2VzIHRoZSBmb2xsb3dpbmcgc3ludGF4OgoKICAgICAgJHt0YXJnZXROYW1lc3BhY2V9OlNlcnZpY2U6JHtTZXJ2aWNlIG5hbWUgYXR0cmlidXRlfQoKICAgIEZvciB0aGUgZXhhbXBsZSBiZWxvdywgdGhlbiwgdGhlIGlkIGZvciB0aGUgZWJYTUwgc2VydmljZSBvYmplY3QgaXM6CgogICAgICB1cm46ZmRjOmxsLm1pdC5lZHU6U2VydmljZTpXQ1MtMDE6U2VydmljZTpNSVRfV2ViQ292ZXJhZ2VTZXJ2aWNlLTAxCgogICAgV2hlbiB0aGVyZSBpcyBJU08gMTkxMzkgbWV0YWRhdGEgYXNzb2NpYXRlZCB3aXRoIGEgc2VydmljZSwgdGhlIGN1cnJlbnQKICAgIGNvbnZlbnRpb24gaXMgdG8gdXNlIHRoZSBhYm92ZSBpZCBhcyB0aGUgdXVpZCBhdHRyaWJ1dGUgb2YgdGhlIAogICAgU1ZfU2VydmljZUlkZW50aWZpY2F0aW9uIGVsZW1lbnQuIFRoZSBlYlhNTCBJU08gMTkxMzkgY2F0YWxvZ2VyIGNhbgogICAgdGhlbiB1c2UgdGhpcyBpbmZvcm1hdGlvbiB0byBsb2dpY2FsbHkgYXNzb2NpYXRlIHRoZSBXU0RMLCBJU08gMTkxMzkgCiAgICBtZXRhZGF0YSwgYW5kIHRoZSBlYlhNTCBTZXJ2aWNlIG9iamVjdAogIC0tPgoKICA8c2VydmljZSBuYW1lPSJNSVRfV2ViQ292ZXJhZ2VTZXJ2aWNlLTAxIj4KICAgIDxwb3J0IG5hbWU9IldDU1NvYXAiIGJpbmRpbmc9ImRmYzpXQ1NTb2FwIj4KICAgICAgPHNvYXA6YWRkcmVzcyBsb2NhdGlvbj0iaHR0cDovL25nZW50c3Qud3gubGwubWl0LmVkdTo4MDgwL3djcy1zcHJpbmciLz4KICAgIDwvcG9ydD4KICA8L3NlcnZpY2U+Cgo8L2RlZmluaXRpb25zPgo=</rim:RepositoryItem>
     </rim:RegistryObject>
-  </CatalogedObjects>
+  </rim:RegistryObjectList>
 </CatalogObjectsResponse>
Index: src/main/resources/xml/examples/ExtrinsicObject_Dataset.xml
===================================================================
--- src/main/resources/xml/examples/ExtrinsicObject_Dataset.xml	(revision 2284)
+++ src/main/resources/xml/examples/ExtrinsicObject_Dataset.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ExtrinsicObject 
+<RegistryObject xsi:type="rim:ExtrinsicObjectType"
   lid="urn:test:Dataset:VIL" id="urn:test:Dataset:VIL" objectType="urn:ogc:def:ebRIM-ObjectType:OGC:Dataset"
   xmlns="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
   xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
@@ -24,6 +24,6 @@
         <LocalizedString value="VIL is the integration of reflectivity within a column of air. See: http://www.theweatherprediction.com/habyhints/249/"; xml:lang="en-US"/>
     </Description>
 
-</ExtrinsicObject>
+</RegistryObject>
 
 
Index: src/main/resources/xml/examples/UpdateObjectsRequest-delete-attribute.xml
===================================================================
--- src/main/resources/xml/examples/UpdateObjectsRequest-delete-attribute.xml	(revision 2284)
+++ src/main/resources/xml/examples/UpdateObjectsRequest-delete-attribute.xml	(working copy)
@@ -18,7 +18,7 @@
     </ObjectRefList>
     <UpdateAction mode="Delete">
         <Selector xsi:type="rim:StringQueryExpressionType" queryLanguage="urn:oasis:names:tc:ebxml-regrep:QueryLanguage:XPath">
-            <rim:Value>./rim:ExtrinsicObject/@mimeType</rim:Value>
+            <rim:Value>./rim:RegistryObject[@xsi:type=rim:ExtrinsicObjectType]/@mimeType</rim:Value>
         </Selector>
     </UpdateAction>
 </UpdateObjectsRequest>
Index: src/main/resources/xml/examples/notification1.xml
===================================================================
--- src/main/resources/xml/examples/notification1.xml	(revision 2284)
+++ src/main/resources/xml/examples/notification1.xml	(working copy)
@@ -1,4 +1,4 @@
-<Notification   
+<RegistryObject xsi:type="rim:NotificationType"   
   subscription="urn:test:subscription:remote1" 
   status="urn:oasis:names:tc:ebxml-regrep:StatusType:Submitted" 
   objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Notification" 
@@ -32,4 +32,4 @@
       </AffectedObjectRefs>
     </Action>
   </Event>
-</Notification>
\ No newline at end of file
+</RegistryObject>
\ No newline at end of file
Index: src/main/resources/xml/examples/UpdateObjectsRequest-update-element.xml
===================================================================
--- src/main/resources/xml/examples/UpdateObjectsRequest-update-element.xml	(revision 2284)
+++ src/main/resources/xml/examples/UpdateObjectsRequest-update-element.xml	(working copy)
@@ -23,7 +23,7 @@
             </rim:Name>
         </ValueHolder>
         <Selector xsi:type="rim:StringQueryExpressionType" queryLanguage="urn:oasis:names:tc:ebxml-regrep:QueryLanguage:XPath">
-            <rim:Value>./rim:Register/rim:Name</rim:Value>
+            <rim:Value>./rim:RegistryObject[@xsi:type=rim:RegisterType]/rim:Name</rim:Value>
         </Selector>
     </UpdateAction>
 </UpdateObjectsRequest>
Index: src/main/resources/xml/examples/remote-subscription.xml
===================================================================
--- src/main/resources/xml/examples/remote-subscription.xml	(revision 2284)
+++ src/main/resources/xml/examples/remote-subscription.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Subscription 
+<RegistryObject xsi:type="rim:SubscriptionType"
   lid="urn:test:subscription:remote1"
   id="urn:test:subscription:remote1"
   notificationInterval="PT1M"
@@ -39,4 +39,4 @@
       </ValueList>
     </Slot>  
   </Selector>
-</Subscription>
+</RegistryObject>
Index: src/main/resources/wsdl/1.1/regrep-server-spi-binding.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/regrep-server-spi-binding.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/regrep-server-spi-binding.wsdl	(working copy)
@@ -7,6 +7,8 @@
   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:spi:bindings:4.0" 
   xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
   >  
   <documentation>
     $Header:$
Index: src/main/resources/wsdl/1.1/NotificationListenerBindings.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/NotificationListenerBindings.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/NotificationListenerBindings.wsdl	(working copy)
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0" xmlns="http://schemas.xmlsoap.org/wsdl/"; xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; xmlns:interfaces="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:interfaces:4.0" xmlns:query="urn:oasis:names:tc:ebxml-regrep:xsd:query:4.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+<definitions
+  targetNamespace="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0"
+  xmlns="http://schemas.xmlsoap.org/wsdl/";
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/";
+  xmlns:interfaces="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:interfaces:4.0"
+  xmlns:query="urn:oasis:names:tc:ebxml-regrep:xsd:query:4.0"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+  xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
+  >
   <documentation>
     $Header: /cvsroot/ebxmlrr/ebxmlrr-spec/misc/4.0/services/NotificationListenerBindings.wsdl,v 1.6 2005/01/31 22:35:35 farrukh_najmi Exp $
     Author: Farrukh Najmi
Index: src/main/resources/wsdl/1.1/regrep-server-spi-interface.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/regrep-server-spi-interface.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/regrep-server-spi-interface.wsdl	(working copy)
@@ -9,6 +9,8 @@
   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:spi:interfaces:4.0" 
   xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
   >
   <documentation>
     $Header:$
Index: src/main/resources/wsdl/1.1/NotificationListenerInterfaces.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/NotificationListenerInterfaces.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/NotificationListenerInterfaces.wsdl	(working copy)
@@ -6,7 +6,10 @@
   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:interfaces:4.0" 
   xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
-  xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0">
+  xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
+  >
   <documentation>
     $Header: /cvsroot/ebxmlrr/ebxmlrr-spec/misc/4.0/services/NotificationListenerInterfaces.wsdl,v 1.7 2005/09/19 13:27:35 rschmi Exp $
     Author: Farrukh Najmi
Index: src/main/resources/wsdl/1.1/NotificationListenerServices.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/NotificationListenerServices.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/NotificationListenerServices.wsdl	(working copy)
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="urn:your:urn:goes:here" xmlns="http://schemas.xmlsoap.org/wsdl/"; xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; xmlns:bindings="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+<definitions
+  targetNamespace="urn:your:urn:goes:here"
+  xmlns="http://schemas.xmlsoap.org/wsdl/";
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/";
+  xmlns:bindings="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
+  >
   <documentation>
     $Header: /cvsroot/ebxmlrr/ebxmlrr-spec/misc/4.0/services/NotificationListenerServices.wsdl,v 1.5 2004/12/24 21:36:34 farrukh_najmi Exp $
     Author: Matt MacKenzie, Farrukh Najmi
Index: src/main/resources/wsdl/1.1/regrep-server-binding.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/regrep-server-binding.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/regrep-server-binding.wsdl	(working copy)
@@ -7,7 +7,10 @@
   xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; 
   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:registry:bindings:4.0" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
+  >
   <documentation>
     $Header:$
     Author: Matt MacKenzie, Farrukh Najmi
Index: src/main/resources/wsdl/1.1/regrep-server-interface.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/regrep-server-interface.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/regrep-server-interface.wsdl	(working copy)
@@ -9,6 +9,8 @@
   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:wsdl:registry:interfaces:4.0" 
   xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
   >
   <documentation>
     $Header:$
Index: src/main/resources/wsdl/1.1/regrep-server-service.wsdl
===================================================================
--- src/main/resources/wsdl/1.1/regrep-server-service.wsdl	(revision 2284)
+++ src/main/resources/wsdl/1.1/regrep-server-service.wsdl	(working copy)
@@ -8,6 +8,8 @@
   xmlns:notb="urn:oasis:names:tc:ebxml-regrep:wsdl:NotificationListener:bindings:4.0"
   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
   xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl";
   >
   <documentation>
     This is the the informative service description template in WSDL for the OASIS ebXML RegRep services.
Index: src/main/resources/xsd/rs.xsd
===================================================================
--- src/main/resources/xsd/rs.xsd	(revision 2284)
+++ src/main/resources/xsd/rs.xsd	(working copy)
@@ -4,6 +4,8 @@
         xmlns="http://www.w3.org/2001/XMLSchema"; 
         xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
         xmlns:tns="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+        xsi:schemaLocation="http://www.w3.org/2001/XMLSchema  http://www.w3.org/2001/XMLSchema.xsd";
         elementFormDefault="qualified"
         attributeFormDefault="unqualified">
     
@@ -34,7 +36,7 @@
           <extension base="rim:ExtensibleObjectType">
             <sequence>
               <element name="Exception" type="tns:RegistryExceptionType" minOccurs="0" maxOccurs="unbounded"/>
-              <element name="RegistryObjectList" type="rim:RegistryObjectListType" minOccurs="0" maxOccurs="1"/>
+              <element ref="rim:RegistryObjectList" minOccurs="0" maxOccurs="1"/>
             </sequence>
             <attribute name="status" type="rim:objectReferenceType" use="required"/>
             <!-- id is the request if for the request for which this is a response -->
Index: src/main/resources/xsd/query.xsd
===================================================================
--- src/main/resources/xsd/query.xsd	(revision 2284)
+++ src/main/resources/xsd/query.xsd	(working copy)
@@ -7,6 +7,8 @@
   xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
   xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0" 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:xsd:query:4.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema  http://www.w3.org/2001/XMLSchema.xsd";
   >
   <import namespace="http://www.w3.org/XML/1998/namespace"; schemaLocation="http://www.w3.org/2001/xml.xsd"/>
   <import namespace="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" schemaLocation="rim.xsd"/>
Index: src/main/resources/xsd/rim.xsd
===================================================================
--- src/main/resources/xsd/rim.xsd	(revision 2284)
+++ src/main/resources/xsd/rim.xsd	(working copy)
@@ -7,15 +7,17 @@
   xmlns:xlink="http://www.w3.org/1999/xlink";
   xmlns:xmime="http://www.w3.org/2005/05/xmlmime";
   xmlns:wsa="http://www.w3.org/2005/08/addressing";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"
+  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema  http://www.w3.org/2001/XMLSchema.xsd";
   >
   
   <annotation>
     <documentation xml:lang="en">The schema for OASIS ebXML Registry Information Model</documentation>
   </annotation>
   <import namespace="http://www.w3.org/XML/1998/namespace"; schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <import namespace="http://www.w3.org/1999/xlink"; schemaLocation="http://schemas.opengis.net/gml/2.1.2/xlinks.xsd"/>
+  <import namespace="http://www.w3.org/1999/xlink"; schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
   <import namespace="http://www.w3.org/2005/08/addressing"; schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
   
   <!-- Begin information model mapping from ebRIM. -->
@@ -106,7 +108,7 @@
     <!--collectionType value MUST reference a ClassificationNode in the canonical CollectionType scheme-->
     <attribute name="collectionType" type="tns:objectReferenceType" use="optional"/>    
   </complexType>
-  <element name="Slot" type="tns:SlotType"/>
+
   <complexType name="ValueListType">
     <annotation>
       <documentation xml:lang="en">
@@ -336,6 +338,7 @@
       </extension>
     </complexContent>
   </complexType>
+  <element name="RegistryObject" type="tns:RegistryObjectType"/>
   
   <complexType name="IdentifiableListType">
     <annotation>
@@ -377,7 +380,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Association" type="tns:AssociationType"/>
   
   <complexType name="ActionType">
     <annotation>
@@ -411,7 +413,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="AuditableEvent" type="tns:AuditableEventType"/>
   
   <complexType name="ClassificationType">
     <annotation>
@@ -428,7 +429,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Classification" type="tns:ClassificationType"/>
   
   <complexType name="TaxonomyElementType" abstract="true">
     <annotation>
@@ -458,7 +458,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ClassificationNode" type="tns:ClassificationNodeType"/>
+
   <complexType name="ClassificationSchemeType">
     <annotation>
       <documentation xml:lang="en">
@@ -472,7 +472,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ClassificationScheme" type="tns:ClassificationSchemeType"/>
+
   <complexType name="ExternalIdentifierType">
     <annotation>
       <documentation xml:lang="en">
@@ -487,7 +487,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ExternalIdentifier" type="tns:ExternalIdentifierType"/>
+
   <complexType name="ExternalLinkType">
     <annotation>
       <documentation xml:lang="en">
@@ -503,7 +503,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ExternalLink" type="tns:ExternalLinkType"/>
   
   <complexType name="SimpleLinkType">
     <annotation>
@@ -514,7 +513,7 @@
       xlink:role="http://www.w3.org/2005/08/wsdl";).
       </documentation>
     </annotation>
-    <attributeGroup ref="xlink:simpleLink"/>
+    <attributeGroup ref="xlink:simpleAttrs"/>
   </complexType>
   
   <complexType name="ExtrinsicObjectType">
@@ -541,7 +540,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ExtrinsicObject" type="tns:ExtrinsicObjectType"/>
 
   <complexType name="CommentType">
     <annotation>
@@ -559,7 +557,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Comment" type="tns:CommentType"/>
 
   <complexType name="PartyType" abstract="true">
     <annotation>
@@ -588,7 +585,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Organization" type="tns:OrganizationType"/>
+
   <complexType name="PersonType">
     <annotation>
       <documentation xml:lang="en">Represents a Person in ebRIM.</documentation>
@@ -605,7 +602,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Person" type="tns:PersonType"/>
+
   <complexType name="PersonNameType">
     <annotation>
       <documentation xml:lang="en">Represents the name of a Person in ebRIM.</documentation>
@@ -666,12 +663,11 @@
     <complexContent>
       <extension base="tns:RegistryObjectType">
         <sequence>
-          <element name="RegistryObjectList" type="tns:RegistryObjectListType" minOccurs="0" maxOccurs="1"/>
+          <element ref="tns:RegistryObjectList" minOccurs="0" maxOccurs="1"/>
         </sequence>
       </extension>
     </complexContent>
   </complexType>
-  <element name="RegistryPackage" type="tns:RegistryPackageType"/>
 
   <complexType name="RegisterType">
     <annotation>
@@ -685,7 +681,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Register" type="tns:RegisterType"/>
 
   <complexType name="ServiceType">
     <annotation>
@@ -703,7 +698,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Service" type="tns:ServiceType"/>
+
   <complexType name="ServiceEndpointType">
     <annotation>
       <documentation xml:lang="en">
@@ -718,7 +713,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ServiceEndpoint" type="tns:ServiceEndpointType"/>
+
   <complexType name="ServiceBindingType">
     <annotation>
       <documentation xml:lang="en">
@@ -732,7 +727,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ServiceBinding" type="tns:ServiceBindingType"/>
+
   <complexType name="ServiceInterfaceType">
     <annotation>
       <documentation xml:lang="en">
@@ -745,7 +740,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="ServiceInterface" type="tns:ServiceInterfaceType"/>
+
   <complexType name="TelephoneNumberType">
     <annotation>
       <documentation xml:lang="en">Represents a telephone number in ebRIM.</documentation>
@@ -782,7 +777,7 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Registry" type="tns:RegistryType"/>
+
   <complexType name="FederationType">
     <annotation>
       <documentation xml:lang="en">Represents a federation of a group of ebXML RegRep servers in ebRIM.</documentation>
@@ -793,7 +788,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Federation" type="tns:FederationType"  />
   
   <complexType name="QueryDefinitionType">
     <annotation>
@@ -810,7 +804,6 @@
       </extension>
     </complexContent>
   </complexType>  
-  <element name="QueryDefinition" type="tns:QueryDefinitionType"/>
   
   <complexType name="ParameterType">
     <annotation>
@@ -912,7 +905,11 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Notification" type="tns:NotificationType"/>  
+
+  <!--
+  Following added as wsdl/1.1/NotificationListenerInterfaces.wsdl did not seem to work with message/part specifying only a type.
+  -->
+  <element name="Notification" type="tns:NotificationType"/>
     
   <complexType name="SubscriptionType">
     <annotation>
@@ -930,7 +927,6 @@
       </extension>
     </complexContent>
   </complexType>
-  <element name="Subscription" type="tns:SubscriptionType"/>
   
   <complexType name="DeliveryInfoType">
     <annotation>
Index: src/main/resources/xsd/lcm.xsd
===================================================================
--- src/main/resources/xsd/lcm.xsd	(revision 2284)
+++ src/main/resources/xsd/lcm.xsd	(working copy)
@@ -5,6 +5,8 @@
   xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
   xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0" 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema  http://www.w3.org/2001/XMLSchema.xsd";
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"
   >
@@ -31,7 +33,7 @@
       <complexContent>
         <extension base="rs:RegistryRequestType">
           <sequence>
-            <element name="RegistryObjectList" type="rim:RegistryObjectListType" minOccurs="0" maxOccurs="1"/>
+            <element ref="rim:RegistryObjectList" minOccurs="0" maxOccurs="1"/>
             <element name="ObjectRefList" type="rim:ObjectRefListType" minOccurs="0" maxOccurs="1" />
           </sequence>
           <attribute name="mode" type="tns:mode" use="optional" default="CreateOrReplace"/>
Index: src/main/resources/xsd/spi.xsd
===================================================================
--- src/main/resources/xsd/spi.xsd	(revision 2284)
+++ src/main/resources/xsd/spi.xsd	(working copy)
@@ -5,6 +5,8 @@
   xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0" 
   xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0" 
   xmlns:tns="urn:oasis:names:tc:ebxml-regrep:xsd:spi:4.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema  http://www.w3.org/2001/XMLSchema.xsd";
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"
   >
Index: src/main/resources/regrep-core.eap
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]