You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/12/02 22:15:48 UTC

svn commit: r351837 - in /geronimo/trunk/modules/service-builder: maven.xml src/schema/geronimo-config-1.0.xsd src/schema/geronimo-service-1.0.xsd

Author: sppatel
Date: Fri Dec  2 13:15:39 2005
New Revision: 351837

URL: http://svn.apache.org/viewcvs?rev=351837&view=rev
Log:
pushed serviceType element from geronimo-service-1.0.xsd to geronimo-config-1.0.xsd

Removed:
    geronimo/trunk/modules/service-builder/src/schema/geronimo-service-1.0.xsd
Modified:
    geronimo/trunk/modules/service-builder/maven.xml
    geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd

Modified: geronimo/trunk/modules/service-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/maven.xml?rev=351837&r1=351836&r2=351837&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/maven.xml (original)
+++ geronimo/trunk/modules/service-builder/maven.xml Fri Dec  2 13:15:39 2005
@@ -24,7 +24,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            maven.xmlbeans2.sourceschema="schema/geronimo-config-1.0.xsd,schema/geronimo-service-1.0.xsd,schema/geronimo-javabean-xmlattribute-1.0.xsd"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-config-1.0.xsd,schema/geronimo-javabean-xmlattribute-1.0.xsd"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">

Modified: geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd?rev=351837&r1=351836&r2=351837&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd (original)
+++ geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd Fri Dec  2 13:15:39 2005
@@ -164,5 +164,13 @@
             <xs:element name="gbean-name" type="xs:string"/>
         </xs:choice>
     </xs:group>
+    
+    <xs:element name="service" type="sys:serviceType"/>
+
+    <xs:complexType name="serviceType">
+        <xs:sequence>
+            <xs:element name="dependency" type="sys:dependencyType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 
 </xs:schema>