karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1556220 - in /karaf/site/trunk/src/main/webapp/xmlns: features/v1.0.0 shell/v1.1.0
Date Tue, 07 Jan 2014 14:14:28 GMT
Author: jbonofre
Date: Tue Jan  7 14:14:28 2014
New Revision: 1556220

URL: http://svn.apache.org/r1556220
Log:
[KARAF-2671] Update the xsd on the website

Modified:
    karaf/site/trunk/src/main/webapp/xmlns/features/v1.0.0
    karaf/site/trunk/src/main/webapp/xmlns/shell/v1.1.0

Modified: karaf/site/trunk/src/main/webapp/xmlns/features/v1.0.0
URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/xmlns/features/v1.0.0?rev=1556220&r1=1556219&r2=1556220&view=diff
==============================================================================
--- karaf/site/trunk/src/main/webapp/xmlns/features/v1.0.0 (original)
+++ karaf/site/trunk/src/main/webapp/xmlns/features/v1.0.0 Tue Jan  7 14:14:28 2014
@@ -31,9 +31,9 @@ Karaf features mechanism. For documentat
     <xs:complexType name="features">
         <xs:annotation>
             <xs:documentation><![CDATA[
-Root element of Feature definition. It contains optional attribute for
-designating from which repository this feature should be loaded. The Karaf
-shell will show the repository name when displaying information about the feature.
+Root element of the Feature definition. It contains an optional attribute for
+designating the name of the repository of this feature. The Karaf shell will
+show the repository name when displaying information about the feature.
             ]]></xs:documentation>
         </xs:annotation>
         <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -65,7 +65,7 @@ Definition of the Feature.
             <xs:element name="details" minOccurs="0" type="xs:string">
                 <xs:annotation>
                     <xs:documentation><![CDATA[
-The help shown for this feature when using the feature:info console command.
+The help text shown for this feature when using the feature:info console command.
                     ]]>
                     </xs:documentation>
                 </xs:annotation>
@@ -97,12 +97,13 @@ If true, marks that the feature should s
         <xs:attribute name="start-level" type="xs:int">
              <xs:annotation>
                 <xs:documentation><![CDATA[
-Set this attribute to have an OSGi start level for this feature different
+Set this attribute to have an OSGi start level for the bundles in this feature different
 from the default start level defined in Karaf's config.properties.
                 ]]>
                 </xs:documentation>
              </xs:annotation>
          </xs:attribute>
+         <xs:attribute name="region" type="xs:string"/>
     </xs:complexType>
 
     <xs:complexType name="bundle">
@@ -118,14 +119,15 @@ Deployable element to install.
                         <xs:documentation><![CDATA[
 Set this attribute to have an OSGi start level for this bundle different
 from the default start level defined in Karaf's config.properties.
+
                         ]]>
                         </xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
-                <xs:attribute name="start" type="xs:boolean">
+                <xs:attribute name="start" type="xs:boolean" default="true">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-If false, leaves bundle in resolved start rather than the default active state.
+If false, leaves the bundle in resolved state rather than the default active state.
                         ]]>
                         </xs:documentation>
                     </xs:annotation>
@@ -133,7 +135,7 @@ If false, leaves bundle in resolved star
                 <xs:attribute name="dependency" type="xs:boolean">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-Mark bundle as a dependency for the resolver.
+Mark this bundle as a dependency for the resolver.
                         ]]>
                         </xs:documentation>
                     </xs:annotation>
@@ -181,7 +183,7 @@ Additional configuration files which sho
                 <xs:attribute name="finalname" type="xs:string" use="required">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-The final destination path and name for the configuration file.
+The final destination path and name for the configuration file (relative to the KARAF_BASE).
                         ]]></xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
@@ -211,7 +213,7 @@ Feature name should be non empty string.
     <xs:simpleType name="resolver">
         <xs:annotation>
             <xs:documentation><![CDATA[
-Resolver to use. Karaf will look for OSGi service which have following properties:
+Resolver to use. Karaf will look for OSGi service which has following properties:
 objectClass: org.apache.karaf.features.Resolver
 name: the value
             ]]></xs:documentation>
@@ -232,7 +234,6 @@ command line or as part of the org.apach
             <xs:minLength value="1" />
         </xs:restriction>
     </xs:simpleType>
-
     <xs:element name="features" type="tns:features" />
 
 </xs:schema>

Modified: karaf/site/trunk/src/main/webapp/xmlns/shell/v1.1.0
URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/xmlns/shell/v1.1.0?rev=1556220&r1=1556219&r2=1556220&view=diff
==============================================================================
--- karaf/site/trunk/src/main/webapp/xmlns/shell/v1.1.0 (original)
+++ karaf/site/trunk/src/main/webapp/xmlns/shell/v1.1.0 Tue Jan  7 14:14:28 2014
@@ -43,11 +43,7 @@
                 </xsd:documentation>
             </xsd:annotation>
             <xsd:sequence>
-                <xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element ref="command"/>
-					<xsd:element ref="alias"/>
-                    <xsd:element ref="link"/>
-				</xsd:choice>
+                <xsd:element ref="command" minOccurs="0" maxOccurs="unbounded"/>
             </xsd:sequence>
         </xsd:complexType>
     </xsd:element>
@@ -74,19 +70,6 @@
                 <xsd:element ref="optional-completers" minOccurs="0" maxOccurs="1"/>
                 <xsd:element ref="message-source" minOccurs="0" maxOccurs="1"/>
             </xsd:sequence>
-            <xsd:attribute name="name" type="xsd:string" use="required"/>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="link">
-        <xsd:complexType>
-            <xsd:annotation>
-                <xsd:documentation>
-                    Defines a link command.
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:attribute name="name" type="xsd:string" use="required"/>
-            <xsd:attribute name="target" type="xsd:string" use="required"/>
         </xsd:complexType>
     </xsd:element>
 
@@ -223,16 +206,4 @@
         </xsd:complexType>
     </xsd:element>
 
-    <xsd:element name="alias">
-        <xsd:complexType>
-            <xsd:annotation>
-                <xsd:documentation>
-                    Defines a command alias.
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:attribute name="name" type="xsd:string" use="required"/>
-            <xsd:attribute name="alias" type="xsd:string" use="required"/>
-        </xsd:complexType>
-    </xsd:element>
-
 </xsd:schema>



Mime
View raw message