Author: not
Date: Wed Nov 18 18:28:05 2009
New Revision: 881864
URL: http://svn.apache.org/viewvc?rev=881864&view=rev
Log:
ARIES-39 updated the blueprint schema
Modified:
incubator/aries/trunk/blueprint/blueprint-api/src/main/resources/org/osgi/service/blueprint/blueprint.xsd
Modified:
incubator/aries/trunk/blueprint/blueprint-api/src/main/resources/org/osgi/service/blueprint/blueprint.xsd
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-api/src/main/resources/org/osgi/service/blueprint/blueprint.xsd?rev=881864&r1=881863&r2=881864&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-api/src/main/resources/org/osgi/service/blueprint/blueprint.xsd
(original)
+++
incubator/aries/trunk/blueprint/blueprint-api/src/main/resources/org/osgi/service/blueprint/blueprint.xsd
Wed Nov 18 18:28:05 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
/*
- * $Revision$
+ * $Revision: 7773 $
*
* Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
*
@@ -298,7 +298,7 @@
<xsd:attribute name="destroy-method"
use="prohibited" />
<xsd:attribute name="factory-method"
type="Tmethod" />
<xsd:attribute name="factory-ref" type="Tidref"
/>
- <xsd:attribute name="scope" use="prohibited"
fixed="prototype" />
+ <xsd:attribute name="scope" use="prohibited" />
<xsd:anyAttribute namespace="##other"
processContents="strict" />
</xsd:restriction>
@@ -1197,10 +1197,19 @@
</xsd:simpleType>
<xsd:simpleType name="Tscope">
- <xsd:restriction base="xsd:NMTOKEN">
- <xsd:enumeration value="singleton" />
- <xsd:enumeration value="prototype" />
- </xsd:restriction>
+ <xsd:union>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:NMTOKEN">
+ <xsd:enumeration value="singleton" />
+ <xsd:enumeration value="prototype" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:QName">
+ <xsd:pattern value=".+:.+" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:union>
</xsd:simpleType>
<xsd:simpleType name="Tservice-use">
