svn commit: r424800 - /webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd

[da...@apache.org]

Author: danj
Date: Sun Jul 23 13:24:55 2006
New Revision: 424800

URL: http://svn.apache.org/viewvc?rev=424800&view=rev
Log:
1. Changed context-path from xsd:anyURI to xsd:NCName so we could avoid slash prefixes at design time using schema 
validation tools in Eclipse, etc. This allows us to assume the descriptor has a simple name in context-path, and that 
we can use that simple name as a directory name when persisting a resource type'e EPRs to disk.

2. Removed the instances-at-startup attribute, because I could not come to a resolution that allowed this feature and 
the persistence of resource instances (save and re-load) to co-exist. Allowing the auto-creation of N instances at startup 
creates an ambiguity when combined with the re-loading of previous resource instances of the same type - does the user 
want both created, or to fall back on the previous one, or to discard the previous one? The answer here is to allow for 
auto-create by putting EPR XML files in the persistence directory and allowing Muse to load them on startup.

Modified:
    webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd

Modified: webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd?rev=424800&r1=424799&r2=424800&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd (original)
+++ webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd Sun Jul 23 13:24:55 2006
@@ -34,7 +34,7 @@
 
   <xs:element name="capability-uri" type="xs:anyURI"/>
 
-  <xs:element name="context-path" type="xs:anyURI"/>
+  <xs:element name="context-path" type="xs:NCName"/>
   
   <xs:element name="custom-serializer">
     <xs:complexType>
@@ -56,6 +56,7 @@
   
   <xs:element name="java-capability-class" type="xs:string"/>
   <xs:element name="java-id-factory-class" type="xs:string"/> 
+  <xs:element name="java-persistence-class" type="xs:string"/> 
   <xs:element name="java-resource-class" type="xs:string"/> 
   <xs:element name="java-router-class" type="xs:string"/> 
   <xs:element name="java-serializable-type" type="xs:string"/> 
@@ -102,6 +103,15 @@
   
   <xs:element name="param-value" type="xs:string"/>
 
+  <xs:element name="persistence">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:java-persistence-class"/>
+        <xs:element ref="tns:init-param" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
   <xs:element name="resource-type">
     <xs:complexType>
       <xs:sequence>
@@ -111,7 +121,6 @@
         <xs:element ref="tns:java-resource-class"/>
         <xs:element ref="tns:capability" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
-      <xs:attribute name="instances-at-startup" type="xs:integer"/>
     </xs:complexType>
   </xs:element>
 
@@ -120,6 +129,7 @@
       <xs:sequence>
         <xs:element ref="tns:java-router-class"/>
         <xs:element ref="tns:logging"/>
+        <xs:element ref="tns:persistence" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org