geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r407593 - /geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd
Date Thu, 18 May 2006 16:54:09 GMT
Author: djencks
Date: Thu May 18 09:54:09 2006
New Revision: 407593

URL: http://svn.apache.org/viewvc?rev=407593&view=rev
Log:
GERONIMO-1563Revert accidental commit of work in process

Modified:
    geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd

Modified: geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd?rev=407593&r1=407592&r2=407593&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd Thu May
18 09:54:09 2006
@@ -156,7 +156,7 @@
 
     <xs:complexType name="dependenciesType">
         <xs:sequence>
-            <xs:element name="dependency" type="sys:dependencyType" minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="dependency" type="sys:artifactType" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation>
                         "dependency" holds an artifact locating an artifact in a repository.
@@ -234,25 +234,9 @@
                 <xs:element name="artifactId" type="xs:string"/>
                 <xs:element name="version" type="xs:string" minOccurs="0"/>
                 <xs:element name="type" type="xs:string" minOccurs="0"/>
-                <!--<xs:element name="import" type="sys:importType" minOccurs="0"/>-->
+                <xs:element name="import" type="sys:importType" minOccurs="0"/>
 
             </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="dependencyType">
-        <xs:complexContent>
-            <xs:extension base="sys:artifactType">
-                <xs:sequence>
-                    <!-- TODO not sure if groupId can in fact be optional -->
-                    <xs:element name="groupId" type="xs:string" minOccurs="0"/>
-                    <xs:element name="artifactId" type="xs:string"/>
-                    <xs:element name="version" type="xs:string" minOccurs="0"/>
-                    <xs:element name="type" type="xs:string" minOccurs="0"/>
-                    <xs:element name="import" type="sys:importType" minOccurs="0"/>
-                </xs:sequence>
-
-            </xs:extension>
-        </xs:complexContent>
     </xs:complexType>
 
     <xs:simpleType name="importType">



Mime
View raw message