Apply fix from bug 363451
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..da92513
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*/target
\ No newline at end of file
diff --git a/gemini.mgmt.repository/pom.xml b/gemini.mgmt.repository/pom.xml
index 7fb6c8f..e34ede5 100644
--- a/gemini.mgmt.repository/pom.xml
+++ b/gemini.mgmt.repository/pom.xml
@@ -39,7 +39,7 @@
 							<execution>
 								<id>pack</id>
 								<configuration>
-									<inputFile>${project.build.directory}/${artifactId}.zip</inputFile>
+									<inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
 								</configuration>
 								<phase>package</phase>
 								<goals>
@@ -49,7 +49,7 @@
 							<execution>
 								<id>sign</id>
 								<configuration>
-									<inputFile>${project.build.directory}/${artifactId}.zip</inputFile>
+									<inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
 									<signerInputDirectory>/home/data/httpd/download-staging.priv/webtools/libra</signerInputDirectory>
 								</configuration>
 								<phase>package</phase>
diff --git a/org.eclipse.gemini.mgmt.tests/pom.xml b/org.eclipse.gemini.mgmt.tests/pom.xml
index 37d2d33..20146fe 100644
--- a/org.eclipse.gemini.mgmt.tests/pom.xml
+++ b/org.eclipse.gemini.mgmt.tests/pom.xml
@@ -13,19 +13,12 @@
 	<packaging>eclipse-test-plugin</packaging>
 	<name>Gemini Management Bundle Tests</name>
 
-<!--	<dependencies>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.enterprise</artifactId>
-			<version>4.2.0</version>
-		</dependency>
-	</dependencies>
--->
 	<build>
 		<plugins>
 		  <plugin>
 				<groupId>org.sonatype.tycho</groupId>
 				<artifactId>maven-osgi-test-plugin</artifactId>
+				<version>${tycho-version}</version>
 				<configuration>
 					<argLine>-Xmx512m -Xms128m -XX:PermSize=128m -XX:MaxPermSize=384m -Dcom.sun.management.jmxremote.port=21045 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false</argLine>
 					<bundleStartLevel>
diff --git a/osgi.enterprise/.classpath b/osgi.enterprise/.classpath
deleted file mode 100644
index 6f66a04..0000000
--- a/osgi.enterprise/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry exported="true" kind="lib" path="osgi.enterprise.jar"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/osgi.enterprise/.project b/osgi.enterprise/.project
deleted file mode 100644
index 9ee87cb..0000000
--- a/osgi.enterprise/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>osgi.enterprise</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/osgi.enterprise/LICENSE b/osgi.enterprise/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/osgi.enterprise/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/osgi.enterprise/META-INF/MANIFEST.MF b/osgi.enterprise/META-INF/MANIFEST.MF
deleted file mode 100644
index 1808ecf..0000000
--- a/osgi.enterprise/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,96 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: osgi.enterprise
-Bundle-SymbolicName: osgi.enterprise
-Bundle-Version: 4.2.0.201003190513
-Bundle-ClassPath: osgi.enterprise.jar
-Bundle-Vendor: OSGi Alliance
-Export-Package: org.osgi.jmx.service.cm;uses:="javax.management.openmbean";version="1.3",
- org.osgi.jmx.framework;uses:="org.osgi.jmx,
- javax.management.openmbean";version="1.5",
- org.osgi.jmx.service.permissionadmin;version="1.2",
- org.osgi.jmx.service.provisioning;uses:="javax.management.openmbean";version="1.2",
- org.osgi.jmx.service.useradmin;uses:="org.osgi.jmx,
- javax.management.openmbean";version="1.1",
- org.osgi.jmx;uses:="javax.management.openmbean";version="1.0",
- org.osgi.service.blueprint.reflect;version="1.0.1",
- org.osgi.service.blueprint.container;uses:="org.osgi.service.blueprint.reflect,
- org.osgi.framework";version="1.0.1",
- org.osgi.service.cm;uses:="org.osgi.framework";version="1.3",
- org.osgi.service.component;uses:="org.osgi.framework";version="1.1",
- org.osgi.service.event;uses:="org.osgi.framework";version="1.2",
- org.osgi.service.http;uses:="javax.servlet.http,
- javax.servlet";version="1.2.1",
- org.osgi.service.provisioning;version="1.2",
- org.osgi.service.remoteserviceadmin;uses:="org.osgi.framework";version="1.0",
- org.osgi.service.jdbc;uses:="javax.sql";version="1.0",
- org.osgi.service.jndi;uses:="javax.naming.directory,
- javax.naming";version="1.0",
- org.osgi.service.jpa;uses:="javax.persistence";version="1.0",
- org.osgi.service.log;uses:="org.osgi.framework";version="1.3",
- org.osgi.service.metatype;uses:="org.osgi.framework";version="1.1",
- org.osgi.service.useradmin;uses:="org.osgi.framework";version="1.1",
- org.osgi.util.tracker;uses:="org.osgi.framework";version="1.4",
- org.osgi.util.xml;uses:="org.osgi.framework,
- javax.xml.parsers";version="1.0.1"
-Import-Package: javax.management.openmbean;resolution:=optional,
- javax.naming;resolution:=optional,
- javax.naming.directory;resolution:=optional,
- javax.persistence;resolution:=optional,
- javax.servlet;resolution:=optional,
- javax.servlet.http;resolution:=optional,
- javax.sql;resolution:=optional,
- javax.xml.parsers;resolution:=optional,
- org.osgi.framework;resolution:=optional;version="[1.5,
- 2)",
- org.osgi.jmx;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.jmx.framework;resolution:=optional;version="[1.5,
- 2)",
- org.osgi.jmx.service.cm;resolution:=optional;version="[1.3,
- 2)",
- org.osgi.jmx.service.permissionadmin;resolution:=optional;version="[1.2,
- 2)",
- org.osgi.jmx.service.provisioning;resolution:=optional;version="[1.2,
- 2)",
- org.osgi.jmx.service.useradmin;resolution:=optional;version="[1.1,
- 2)",
- org.osgi.service.blueprint.container;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.service.blueprint.reflect;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.service.cm;resolution:=optional;version="[1.3,
- 2)",
- org.osgi.service.component;resolution:=optional;version="[1.1,
- 2)",
- org.osgi.service.event;resolution:=optional;version="[1.2,
- 2)",
- org.osgi.service.http;resolution:=optional;version="[1.2,
- 2)",
- org.osgi.service.jdbc;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.service.jndi;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.service.jpa;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.service.log;resolution:=optional;version="[1.3,
- 2)",
- org.osgi.service.metatype;resolution:=optional;version="[1.1,
- 2)",
- org.osgi.service.provisioning;resolution:=optional;version="[1.2,
- 2)",
- org.osgi.service.remoteserviceadmin;resolution:=optional;version="[1.0,
- 2)",
- org.osgi.service.useradmin;resolution:=optional;version="[1.1,
- 2)",
- org.osgi.util.tracker;resolution:=optional;version="[1.4,
- 2)",
- org.osgi.util.xml;resolution:=optional;version="[1.0,
- 2)"
-DynamicImport-Package: *
-Created-By: 1.6.0_18 (Sun Microsystems Inc.)
-Bundle-Copyright: Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved.
-Tool: Bnd-0.0.386
-Bundle-License: http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0"
-Bnd-LastModified: 1269033188762
-Bundle-Description: OSGi Service Platform Release 4 Version 4.2, Enterprise Interfaces and Classes for use in compiling bundles.
diff --git a/osgi.enterprise/OSGI-OPT/bnd.bnd b/osgi.enterprise/OSGI-OPT/bnd.bnd
deleted file mode 100644
index 477ecac..0000000
--- a/osgi.enterprise/OSGI-OPT/bnd.bnd
+++ /dev/null
@@ -1,10 +0,0 @@
-#Generated by BND, at Fri Mar 19 17:13:08 EDT 2010
-#Fri Mar 19 17:13:08 EDT 2010
--sub=
-Bundle-Description=OSGi Service Platform Release ${version;\=;${enterprise.release.version}} Version ${version;\=\=;${enterprise.release.version}}, Enterprise Interfaces and Classes for use in compiling bundles.
-Import-Package=*; resolution\:\=optional
-Export-Package=${enterprise.packages}
-Bundle-Version=4.2.0.201003190513
-DynamicImport-Package=*
-project.dir=/home/osgi/build/r4v42-enterprise-spec-final/osgi.companion
-Include-Resource=${enterprise.resources}
diff --git a/osgi.enterprise/about.html b/osgi.enterprise/about.html
deleted file mode 100644
index 0f0103f..0000000
--- a/osgi.enterprise/about.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=UTF-8">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<h3>Copyright</h3>
-<p>Copyright &copy; OSGi Alliance (2000, 2010). All Rights Reserved.</p>
-
-<p>OSGi Alliance<br/>
-Bishop Ranch 6<br/>
-2400 Camino Ramon, Suite 375<br/>
-San Ramon, CA 94583 USA
-</p>
-
-<h3>License</h3>
-<p>The OSGi Alliance makes available all content in this jar (&quot;Work&quot;).  Unless otherwise indicated below, the Work is provided to you under the terms and conditions of the
-Apache License, Version 2.0 (the &quot;License&quot;).  A copy of the License is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p>
-
-<h3>Notices</h3>
-<p>Implementation of certain elements of the Content may be subject to third party
-intellectual property rights, including without limitation, patent rights (such a third party may
-or may not be a member of the OSGi Alliance). The OSGi Alliance and its members are not responsible 
-and shall not be held responsible in any manner for identifying or failing to identify any or 
-all such third party intellectual property rights.</p>
-
-<p>OSGi&trade; is a trademark, registered trademark, or service mark
-of The OSGi Alliance in the US and other countries. Java is a trademark,
-registered trademark, or service mark of Sun Microsystems, Inc. in the US
-and other countries. All other trademarks, registered trademarks, or
-service marks used in the Content are the property of their respective
-owners and are hereby recognized.</p>
-
-</body>
-</html>
diff --git a/osgi.enterprise/osgi.enterprise.jar b/osgi.enterprise/osgi.enterprise.jar
deleted file mode 100644
index 81db134..0000000
--- a/osgi.enterprise/osgi.enterprise.jar
+++ /dev/null
Binary files differ
diff --git a/osgi.enterprise/pom.xml b/osgi.enterprise/pom.xml
deleted file mode 100644
index 27b99b4..0000000
--- a/osgi.enterprise/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.gemini.mgmt</groupId>
-		<artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../gemini.mgmt.releng/pom.xml</relativePath>
-	</parent>
-
-	<artifactId>osgi.enterprise</artifactId>
-	<version>4.2.0.201003190513</version>
-	<packaging>eclipse-plugin</packaging>
-	<name>OSGi Enterprise Bundle</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/osgi.enterprise/xmlns/blueprint/v1.0.0/blueprint.xsd b/osgi.enterprise/xmlns/blueprint/v1.0.0/blueprint.xsd
deleted file mode 100644
index bb90506..0000000
--- a/osgi.enterprise/xmlns/blueprint/v1.0.0/blueprint.xsd
+++ /dev/null
@@ -1,1233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-    /*
-    * $Revision: 7773 $
-    *
-    * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
-    *
-    * Licensed under the Apache License, Version 2.0 (the "License");
-    * you may not use this file except in compliance with the License.
-    * You may obtain a copy of the License at
-    *
-    *      http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing, software
-    * distributed under the License is distributed on an "AS IS" BASIS,
-    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    * See the License for the specific language governing permissions and
-    * limitations under the License.
-    */
-    -->
-<xsd:schema xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	elementFormDefault="qualified" attributeFormDefault="unqualified"
-	version="1.0.0">
-
-	<xsd:annotation>
-		<xsd:documentation>
-        	<![CDATA[
-                This is the XML Schema for the OSGi Blueprint service 1.0.0
-                development descriptor.  Blueprint configuration files
-                using this schema must indicate the schema using the
-                blueprint/v1.0.0 namespace.  For example,
-
-                <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
-                if used as a qualified namespace, "bp" is the recommended
-                namespace prefix.
-            ]]>
-		</xsd:documentation>
-	</xsd:annotation>
-
-	<!-- Schema elements for core component declarations -->
-
-	<xsd:complexType name="Tcomponent" abstract="true">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                    The Tcomponent type is the base type for top-level
-                    Blueprint components.  The <bean> <reference>, <service>,
-                    and <reference-list> elements are all derived from
-                    the Tcomponent type.  This type defines an id attribute
-                    that is used create references between different components.
-                    Component elements can also be inlined within other component
-                    definitions.  The id attribute is not valid when inlined.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-
-		<xsd:attribute name="id" type="xsd:ID" />
-
-		<xsd:attribute name="activation" type="Tactivation">
-			<xsd:annotation>
-				<xsd:documentation>
-                    <![CDATA[
-                    The activation attribute for this component.  This can either
-                    be "eager" or "lazy".  If not specified, it
-                    defaults to default-activation attribute of the enclosing
-                    <blueprint> element.
-                    ]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-
-		<xsd:attribute name="depends-on" type="TdependsOn">
-			<xsd:annotation>
-				<xsd:documentation>
-                    <![CDATA[
-                    depends-on identifies (by id) other components that this component
-                    depends on.  The component only be activated after the
-                    depends-on components are successfully activated.  Also, if there
-                    are <reference> or <reference-list> elements with unstatisfied
-                    manadatory references, then the depends-on relationship will also
-                    be used to determine whether this service is enabled or not.
-                    ]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:element name="blueprint" type="Tblueprint">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The <blueprint> element is the root element for a blueprint
-                configuration file.  A blueprint configuration has two sections.
-                The first section (contained within the <type-converters> element)
-                identifies components that are used for converting values into
-                different target types.  The type converters are optional, so
-                the file does not need to specify a type converter section.
-
-                Following the type converters are the component definitions.
-                Components are <bean>, <service>, <reference>, and
-                <reference-list> elements that identify the bundle components that will
-                be managed by the blueprint service.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-
-	<xsd:complexType name="Tblueprint">
-		<xsd:sequence>
-			<xsd:element name="description" type="Tdescription"
-				minOccurs="0" />
-			<xsd:element name="type-converters" type="Ttype-converters"
-				minOccurs="0" maxOccurs="1" />
-			<!-- top-level components -->
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="service" type="Tservice" />
-				<xsd:element name="reference-list" type="Treference-list" />
-				<xsd:element name="bean" type="Tbean" />
-				<xsd:element name="reference" type="Treference" />
-				<xsd:any namespace="##other" processContents="strict" />
-			</xsd:choice>
-		</xsd:sequence>
-
-		<!-- Defaults-->
-		<xsd:attribute name="default-activation" default="eager"
-			type="Tactivation">
-			<xsd:annotation>
-				<xsd:documentation>
-                    <![CDATA[
-                    Specifies the default activation setting that will be defined
-                    for components.  If not specified, the global default is "eager".
-                    Individual components may override the default value.
-                    ]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="default-timeout" type="Ttimeout"
-			default="300000">
-			<xsd:annotation>
-				<xsd:documentation>
-                    <![CDATA[
-                    Specifies the default timeout value to be used when operations
-                    are invoked on unstatisfied service references.  If the
-                    reference does not change to a satisfied state within the timeout
-                    window, an error is raised on the method invocation.  The
-                    default timeout value is 300000 milliseconds and individual
-                    <reference> element can override the specified configuration
-                    default.
-                    ]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="default-availability" type="Tavailability"
-			default="mandatory">
-			<xsd:annotation>
-				<xsd:documentation>
-                    <![CDATA[
-                    Specifies the default availability value to be used for
-                    <reference>, and <reference-list> components.  The
-                    normal default is "mandatory", and can be changed by individual
-                    service reference components.
-                    ]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:anyAttribute namespace="##other"
-			processContents="strict" />
-	</xsd:complexType>
-
-	<xsd:complexType name="Ttype-converters">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The type used for the <type-converters> element.  The
-                <type-converters> section is a set of <bean>, <ref>, or
-                <reference> elements that identify the type converter components.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="bean" type="Tbean" />
-			<xsd:element name="reference" type="Treference" />
-			<xsd:element name="ref" type="Tref" />
-			<xsd:any namespace="##other" processContents="strict" />
-		</xsd:choice>
-	</xsd:complexType>
-
-	<!--
-		Components that provide a reasonable target for injection used for
-		listeners, etc.
-	-->
-
-	<xsd:group name="GtargetComponent">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                A target component is one that can be a target for a
-                listener, registration-listener or service elements.
-                This is used in contexts where the requirement is a single
-                provided object that will implement a particular interface.
-                The provided object is obtained either from a <ref> element
-                or an inlined <bean> or <reference>.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice>
-			<xsd:element name="bean" type="Tinlined-bean" />
-			<xsd:element name="reference" type="Tinlined-reference" />
-			<xsd:element name="ref" type="Tref" />
-			<xsd:any namespace="##other" processContents="strict" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:group name="GallComponents">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                An all components is used in contexts where all component element
-                types are values.  The set of component elements contains
-                <bean>, <service>, <reference>, <reference-list> and <ref>.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice>
-			<xsd:element name="service" type="Tinlined-service" />
-			<xsd:element name="reference-list" type="Tinlined-reference-list" />
-			<xsd:group ref="GtargetComponent" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:group name="GbeanElements">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                A bean elements is a reusable definition of the elements allowed on 
-                a <bean> element.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="description" type="Tdescription"
-				minOccurs="0" />
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="argument" type="Targument" />
-				<xsd:element name="property" type="Tproperty" />
-				<xsd:any namespace="##other" processContents="strict" />
-			</xsd:choice>
-		</xsd:sequence>
-	</xsd:group>
-
-	<xsd:complexType name="Tbean">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The type definition for a <bean> component.  The <bean> 
-                attributes provide the characteristics for how to create a
-                bean instance.  Constructor arguments and injected properties
-                are specified via child <argument> and <property> elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="Tcomponent">
-				<xsd:group ref="GbeanElements" />
-				<xsd:attribute name="class" type="Tclass" />
-				<xsd:attribute name="init-method" type="Tmethod" />
-				<xsd:attribute name="destroy-method" type="Tmethod" />
-				<xsd:attribute name="factory-method" type="Tmethod" />
-				<xsd:attribute name="factory-ref" type="Tidref" />
-				<xsd:attribute name="scope" type="Tscope" />
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="Tinlined-bean">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Tinlined-bean type is used for inlined (i.e. non top level)
-                <bean> elements.  Those elements have some restrictions on
-                the attributes that can be used to define them.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:restriction base="Tbean">
-				<xsd:group ref="GbeanElements" />
-				<xsd:attribute name="id" use="prohibited" />
-				<xsd:attribute name="depends-on" type="TdependsOn" />
-				<xsd:attribute name="activation" use="prohibited"
-					fixed="lazy" />
-				<xsd:attribute name="class" type="Tclass" />
-				<xsd:attribute name="init-method" type="Tmethod" />
-				<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" />
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:restriction>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="Targument">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                An argument used to create an object defined by a <bean>
-                component.  The <argument> elements are the arguments for the
-                bean class constructor or passed to the bean factory method.
-
-                The type, if specified, is used to disambiguate the constructor
-                or method signature.  Arguments may also be matched up with
-                arguments by explicitly specifying the index position.  If the
-                index is used, then all <argument> elements for the bean must
-                also specify the index.
-
-                The value and ref attributes are convenience shortcuts to make
-                the <argument> tag easier to code.  A fuller set of injected
-                values and types can be specified using one of the "value"
-                type elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="description" type="Tdescription"
-				minOccurs="0" />
-			<xsd:group ref="Gvalue" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="index" type="xsd:nonNegativeInteger" />
-		<xsd:attribute name="type" type="Ttype" />
-		<xsd:attribute name="ref" type="Tidref" />
-		<xsd:attribute name="value" type="TstringValue" />
-	</xsd:complexType>
-
-	<xsd:complexType name="Tproperty">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                A property that will be injected into a created <bean>
-                component.  The <property> elements correspond to named
-                JavaBean setting methods for a created bean object.
-
-                The value and ref attributes are convenience shortcuts to make
-                the <argument> tag easier to code.  A fuller set of injected
-                values and types can be specified using one of the "value"
-                type elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="description" type="Tdescription"
-				minOccurs="0" />
-			<xsd:group ref="Gvalue" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="name" type="Tmethod" use="required" />
-		<xsd:attribute name="ref" type="Tidref" />
-		<xsd:attribute name="value" type="TstringValue" />
-	</xsd:complexType>
-
-	<xsd:complexType name="Tkey">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Tkey type defines the element types that are permitted
-                for Map key situations.  These can be any of the "value"
-                types other than the <null> element.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:group ref="GnonNullValue" />
-	</xsd:complexType>
-
-	<!-- reference -->
-	<xsd:complexType name="Treference">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Treference type defines the <reference> element.  These
-                are instances of the TserviceReference type, with the addition
-                of a timeout attribute.  If the timeout is not specified,
-                the default-timeout value is inherited from the encapsulating
-                <blueprint> definition.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="TserviceReference">
-				<xsd:sequence>
-					<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-						processContents="strict" />
-				</xsd:sequence>
-				<xsd:attribute name="timeout" type="Ttimeout" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="Tinlined-reference">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Tinlined-reference type is used for inlined (i.e. non top level)
-                <reference> elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:restriction base="Treference">
-				<xsd:sequence>
-					<xsd:group ref="GserviceReferenceElements" />
-					<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-						processContents="strict" />
-				</xsd:sequence>
-				<xsd:attribute name="id" use="prohibited" />
-				<xsd:attribute name="depends-on" type="TdependsOn" />
-				<xsd:attribute name="activation" use="prohibited"
-					fixed="lazy" />
-				<xsd:attribute name="interface" type="Tclass" />
-				<xsd:attribute name="filter" type="xsd:normalizedString" />
-				<xsd:attribute name="component-name" type="Tidref" />
-				<xsd:attribute name="availability" type="Tavailability" />
-				<xsd:attribute name="timeout" type="Ttimeout" />
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:restriction>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<!-- reference-list -->
-	<xsd:complexType name="Treference-list">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Treference-list builds in the characteristics of the
-                TserviceReference type to define characteristics of the
-                <reference-list>.  This adds in the characteristics that
-                only apply to collections of references (e.g., member-type).
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="TserviceReference">
-				<xsd:sequence>
-					<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-						processContents="strict" />
-				</xsd:sequence>
-				<xsd:attribute name="member-type" type="Tservice-use"
-					default="service-object">
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="Tinlined-reference-list">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Tinlined-reference-list type is used for inlined (i.e. non top level)
-                <reference-list> elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:restriction base="Treference-list">
-				<xsd:sequence>
-					<xsd:group ref="GserviceReferenceElements" />
-					<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-						processContents="strict" />
-				</xsd:sequence>
-				<xsd:attribute name="id" use="prohibited" />
-				<xsd:attribute name="depends-on" type="TdependsOn" />
-				<xsd:attribute name="activation" use="prohibited"
-					fixed="lazy" />
-				<xsd:attribute name="interface" type="Tclass" />
-				<xsd:attribute name="filter" type="xsd:normalizedString" />
-				<xsd:attribute name="component-name" type="Tidref" />
-				<xsd:attribute name="availability" type="Tavailability" />
-				<xsd:attribute name="member-type" type="Tservice-use"
-					default="service-object" />
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:restriction>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<!-- Reference base class -->
-	<xsd:complexType name="TserviceReference">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TserviceReference is the base element type used for <reference>
-                and <reference-list> elements.  This type defines all of the
-                characteristics common to both sorts of references.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="Tcomponent">
-				<xsd:sequence>
-					<xsd:group ref="GserviceReferenceElements" />
-				</xsd:sequence>
-
-				<xsd:attribute name="interface" type="Tclass">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            The interface that the OSGi service must implement and that will be
-                            implemented by the proxy object.
-                            This attribute is optional.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="filter" type="xsd:normalizedString">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            A filter string used to narrow the search for a matching service
-                            reference.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="component-name" type="Tidref">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            An optional specifier that can be used to match a service definition
-                            to one created by a specific blueprint component.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="availability" type="Tavailability">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            Use to control the initial processing of service references at
-                            blueprint context startup.  "mandatory" indicates the context
-                            should not start unless the service is available within the
-                            specified context startup period.  "optional" indicates availability
-                            of this service is not a requirement at bundle startup.
-
-                            NOTE:  No default is specified because this can be overridden
-                            by the default-availability attribute of the <blueprint> element.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:group name="GserviceReferenceElements">
-		<xsd:sequence>
-			<xsd:element name="description" type="Tdescription"
-				minOccurs="0" />
-			<!-- listener -->
-			<xsd:element name="reference-listener" type="TreferenceListener"
-				minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>
-                        <![CDATA[
-                        A definition of a listener that will watch for bind/unbind events
-                        associated with the service reference.  The targetted listener can
-                        be a <ref> to a <bean> or <reference> element, or an inline
-                        <bean> or <reference>.
-                        ]]>
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:group>
-
-	<xsd:complexType name="TreferenceListener">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TReferenceListener defines a reference listener that is attached
-                to a <reference> or <reference-list> element.  The listener
-                object can be specified as a <ref> or as an inline <bean> or
-                <reference> component.  Listener events are mapped to the indicated
-                bind or unbind methods.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:group ref="GtargetComponent" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="ref" type="Tidref" />
-		<xsd:attribute name="bind-method" type="Tmethod" />
-		<xsd:attribute name="unbind-method" type="Tmethod" />
-	</xsd:complexType>
-
-	<xsd:simpleType name="Tactivation">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tactivation defines the activation type for components.  This is used in this
-                schema by the <blueprint> default-activation attribute and the
-                activation attribute.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="eager" />
-			<xsd:enumeration value="lazy" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Tavailability">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tavailability defines an availability attribute type.  This is used in this
-                schema by the <blueprint> default-availability attribute and the
-                <reference> and <reference-list> availability attribute.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="mandatory" />
-			<xsd:enumeration value="optional" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<!-- service -->
-
-	<xsd:complexType name="Tservice">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tservice is the type for services exported by this blueprint bundle.
-                Services are sourced by either a <ref> to a <bean> component or an
-                <inline> bean component.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="Tcomponent">
-				<xsd:sequence>
-					<xsd:group ref="GserviceElements" />
-				</xsd:sequence>
-				<xsd:attribute name="interface" type="Tclass">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            The interface that this OSGi service will provide.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="ref" type="Tidref">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            The ref attribute can be used to specify the component that provides
-                            the object exported as an OSGi service.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="auto-export" type="TautoExportModes"
-					default="disabled">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            If set to a value different from "disabled", the Blueprint Container
-                            will introspect the target to discover the set of interfaces or classes
-                            that the service will be registered under.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="ranking" type="xsd:int" default="0">
-					<xsd:annotation>
-						<xsd:documentation>
-                            <![CDATA[
-                            A service ranking value that is added to the service properties
-                            the service will be published with.
-                            ]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="Tinlined-service">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The Tinlined-service type is used for inlined (i.e. non top level)
-                <service> elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:restriction base="Tservice">
-				<xsd:sequence>
-					<xsd:group ref="GserviceElements" />
-				</xsd:sequence>
-				<xsd:attribute name="id" use="prohibited" />
-				<xsd:attribute name="depends-on" type="TdependsOn" />
-				<xsd:attribute name="activation" use="prohibited"
-					fixed="lazy" />
-				<xsd:attribute name="interface" type="Tclass" />
-				<xsd:attribute name="ref" type="Tidref" />
-				<xsd:attribute name="auto-export" type="TautoExportModes"
-					default="disabled" />
-				<xsd:attribute name="ranking" type="xsd:int" default="0" />
-				<xsd:anyAttribute namespace="##other"
-					processContents="strict" />
-			</xsd:restriction>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:group name="GbaseServiceElements">
-		<xsd:sequence>
-			<xsd:element name="description" type="Tdescription"
-				minOccurs="0" />
-			<xsd:element name="interfaces" type="Tinterfaces"
-				minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>
-                        <![CDATA[
-                        A collection of one or more interface class names this service
-                        will be registered under.  The <service> element also has
-                        a shortcut interface attribute for the usual case of just
-                        a single interface being used.  This also cannot be used if
-                        the auto-export attribute is used.
-                        ]]>
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-
-			<xsd:element name="service-properties" type="TserviceProperties"
-				minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>
-                        <![CDATA[
-                        The service provided when the service is registered.  The service
-                        properties are similar to map elements, but the keys must always
-                        be strings, and the values are required to be in a narrower range.
-                        ]]>
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="registration-listener" type="TregistrationListener"
-				minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>
-                        <![CDATA[
-                        A set of 0 or more registration listeners attached to this service
-                        component.  The registration listeners will be notified whenever the
-                        service is registered or unregistered from the framework service
-                        registry.
-                        ]]>
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:group>
-
-	<xsd:group name="GserviceElements">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                A set of service elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:group ref="GbaseServiceElements" />
-			<xsd:group ref="GtargetComponent" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>
-                        <![CDATA[
-                        A service definition can use any of the target types as an inline element
-                        as well.
-                        ]]>
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:group>
-		</xsd:sequence>
-	</xsd:group>
-
-	<xsd:complexType name="TregistrationListener">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                A registration listener definition.  The target registration listener
-                can be either a <ref> to a <bean> or <service> component, or an inline
-                <bean> or <service> component definition.  The registration-method and
-                unregistration-method attributes define the methods that will be called
-                for the respective events.
-
-                For the very common case of using a <ref> to a listener component, the
-                ref attribute may also be used as a shortcut.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:group ref="GtargetComponent" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="ref" type="Tidref" />
-		<xsd:attribute name="registration-method" type="Tmethod" />
-		<xsd:attribute name="unregistration-method" type="Tmethod" />
-	</xsd:complexType>
-
-	<!-- Values -->
-
-	<xsd:group name="Gvalue">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The set of "value" types that can be used in any place a value
-                can be specified.  This set includes the <ref> and <idref> elements, any of the
-                component types (<bean>, <service>, etc.) as inline components, the
-                generic <value> element for types sourced from string values, any of the
-                collection types (<set>, <list>, <array>, <map>, <props>), and the
-                <null> type to inject a null value.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice>
-			<xsd:group ref="GnonNullValue" />
-			<xsd:element name="null" type="Tnull" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:complexType name="Tnull">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The definition for a <null> value type.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:complexType>
-
-	<xsd:group name="GnonNullValue">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The set of "value" types that can be used in any place a non-null value
-                can be specified.  This set includes the <ref> and <idref> elements, any of the
-                component types (<bean>, <service>, etc.) as inline components, the
-                generic <value> element for types sourced from string values, and any of the
-                collection types (<set>, <list>, <array>, <map>, <props>).
-
-                The <null> type is NOT a member of this group.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice>
-			<xsd:group ref="GallComponents" />
-			<xsd:element name="idref" type="Tref" />
-			<xsd:element name="value" type="Tvalue" />
-			<xsd:element name="list" type="Tcollection" />
-			<xsd:element name="set" type="Tcollection" />
-			<xsd:element name="map" type="Tmap" />
-			<xsd:element name="array" type="Tcollection" />
-			<xsd:element name="props" type="Tprops" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:complexType name="Tref">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tref is the type used for <ref> elements.  This specifies a required
-                component id for the reference component.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="component-id" type="Tidref" use="required" />
-	</xsd:complexType>
-
-	<xsd:complexType name="Tvalue" mixed="true">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tvalue is the type used for <value> elements.  The <value> element
-                is used for types that can be created from a single string value.
-                The string value is the data value for the element.  The optional
-                type attribute allows a target conversion value to be explicitly
-                specified.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="type" type="Ttype" />
-	</xsd:complexType>
-
-	<!-- Collection Values -->
-
-	<xsd:complexType name="TtypedCollection">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TtypeCollection defines comment attributes shared among different
-                collection types that allow a default value type to be specified.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="value-type" type="Ttype" />
-	</xsd:complexType>
-
-	<xsd:complexType name="Tcollection">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tcollection is the base schema type for different ordered collection
-                types.  This is shared between the <array>, <list>, and <set> elements.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="TtypedCollection">
-				<xsd:group ref="Gvalue" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="Tprops">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tprops is the type used by the <props> value element.  The prop elements
-                are pairs of string-valued keys and values.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="prop" type="Tprop" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="Tprop" mixed="true">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tprop is a single property element for a <props> value type.  The property
-                value can be specified using either the attribute, or as value data for
-                the property element.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="key" type="TstringValue" use="required" />
-		<xsd:attribute name="value" type="TstringValue" />
-	</xsd:complexType>
-
-	<!-- 'map' element type -->
-	<xsd:complexType name="Tmap">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tmap is the base type used for <map> elements.  A map may have a
-                default value type specified, so it inherits from the TtypeCollection
-                type.  A key type can also be specified, and the map members are
-                created from the entry elements, which require a key/value pair.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="TtypedCollection">
-				<xsd:sequence>
-					<xsd:element name="entry" type="TmapEntry" minOccurs="0"
-						maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="key-type" type="Ttype" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<!-- 'entry' element type -->
-	<xsd:complexType name="TmapEntry">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TmapEntry is used for <entry> elements nested inside of a <map> element.
-                Each <entry> instance defines a key/value pair that will be added to the
-                Map.  Both the keys and values may be arbitrary types.  Keys must not
-                be <null> but <null> is permitted for entry values.  A default type
-                can be specified for both the keys and the values, but individual keys
-                or values can override the default.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="key" type="Tkey" minOccurs="0" />
-			<xsd:group ref="Gvalue" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="key" type="TstringValue" />
-		<xsd:attribute name="key-ref" type="Tidref" />
-		<xsd:attribute name="value" type="TstringValue" />
-		<xsd:attribute name="value-ref" type="Tidref" />
-	</xsd:complexType>
-
-	<!-- 'service property' element type -->
-	<xsd:complexType name="TserviceProperties">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TserviceProperty is used for <service-properties> elements.
-                The syntax is similar to what is defined for <map>, but keys must be
-                string values and there are no type defaults that can be specified.
-                created from the entry elements, which require a key/value pair.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="entry" type="TservicePropertyEntry"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:any namespace="##other" processContents="strict"
-				minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<!-- 'entry' element type -->
-	<xsd:complexType name="TservicePropertyEntry">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TservicePropertyEntry is an entry value used for the <service-properties>
-                element.  This does not allow a child <key> element and there are no
-                key-ref or value-ref attributes.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:group ref="Gvalue" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="key" type="TstringValue" use="required" />
-		<xsd:attribute name="value" type="TstringValue" />
-	</xsd:complexType>
-
-	<!-- General types -->
-
-	<xsd:complexType name="Tdescription" mixed="true">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                A generic <description> element type to allow documentation to added to the
-                blueprint configuration.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded" />
-	</xsd:complexType>
-
-	<xsd:complexType name="Tinterfaces">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                The type definition for the <interfaces> element used for <service>
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="1" maxOccurs="unbounded">
-			<xsd:element name="value" type="TinterfaceValue" />
-		</xsd:choice>
-	</xsd:complexType>
-
-	<xsd:simpleType name="TinterfaceValue">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TinterfaceValue is used for subelements of the <interfaces> element.
-                This is just a <value>xxxxx</value> element where the contained
-                value is the name of an interface class.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="Tclass" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Tclass">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tclass is a base type that should be used for all attributes that
-                refer to java class names.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Ttype">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Ttype is a base type that refer to java types such as classes or
-                arrays.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:token">
-			<xsd:pattern value="[\i-[:]][\c-[:]]*(\[\])*" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Tmethod">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tmethod is a base type that should be used for all attributes that
-                refer to java method names.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName" />
-	</xsd:simpleType>
-
-	<!--
-		Should be used for all attributes and elements that refer to method
-		names
-	-->
-	<xsd:simpleType name="Tidref">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Tidref is a base type that should be used for all attributes that
-                refer to component ids.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="TstringValue">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TstringValue is a base type that should be used for all attributes that
-                refer to raw string values
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:normalizedString" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="TautoExportModes">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TautoExportModes is a base type that should be used for export-mode
-                attributes.
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="disabled" />
-			<xsd:enumeration value="interfaces" />
-			<xsd:enumeration value="class-hierarchy" />
-			<xsd:enumeration value="all-classes" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Ttimeout">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                Ttimeout is a base type that should be used for all attributes that
-                specify timeout values
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:unsignedLong" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="TdependsOn">
-		<xsd:annotation>
-			<xsd:documentation>
-                <![CDATA[
-                TdependsOn is a base type that should be used for all attributes that
-                specify depends-on relationships
-                ]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction>
-			<xsd:simpleType>
-				<xsd:list itemType="Tidref" />
-			</xsd:simpleType>
-			<xsd:minLength value="1" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Tscope">
-		<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">
-		<xsd:annotation>
-			<xsd:documentation>
-				<![CDATA[
-                Indicates the type of object that will be placed within the
-                reference collection.  "service-object" indicates the 
-                collection contains blueprint proxies for imported services.  
-                "service-reference" indicates the collection contains 
-                ServiceReference objects matching the target service type.
-				]]>
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="service-object" />
-			<xsd:enumeration value="service-reference" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-</xsd:schema>
diff --git a/osgi.enterprise/xmlns/metatype/v1.0.0/metatype.xsd b/osgi.enterprise/xmlns/metatype/v1.0.0/metatype.xsd
deleted file mode 100644
index 97d70d3..0000000
--- a/osgi.enterprise/xmlns/metatype/v1.0.0/metatype.xsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * $Revision: 5673 $
- * 
- * Copyright (c) OSGi Alliance (2005, 2008). All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.osgi.org/xmlns/metatype/v1.0.0"
-	xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0">
-
-	<complexType name="MetaData">
-		<sequence>
-			<element name="OCD" type="metatype:OCD" minOccurs="0"
-				maxOccurs="unbounded" />
-			<element name="Designate" type="metatype:Designate"
-				minOccurs="0" maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="localization" type="string" use="optional" />
-	</complexType>
-
-	<complexType name="OCD">
-		<sequence>
-			<element name="AD" type="metatype:AD" minOccurs="1"
-				maxOccurs="unbounded" />
-			<element name="Icon" type="metatype:Icon" minOccurs="0"
-				maxOccurs="1" />
-		</sequence>
-		<attribute name="name" type="string" use="required" />
-		<attribute name="description" type="string" use="optional" />
-		<attribute name="id" type="string" use="required" />
-	</complexType>
-
-	<complexType name="AD">
-		<sequence>
-			<element name="Option" type="metatype:Option" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="string" use="optional" />
-		<attribute name="description" type="string" use="optional" />
-		<attribute name="id" type="string" use="required" />
-		<attribute name="type" type="metatype:Scalar" use="required" />
-		<attribute name="cardinality" type="int" use="optional"
-			default="0" />
-		<attribute name="min" type="string" use="optional" />
-		<attribute name="max" type="string" use="optional" />
-		<attribute name="default" type="string" use="optional" />
-		<attribute name="required" type="boolean" use="optional"
-			default="true" />
-	</complexType>
-
-	<complexType name="Object">
-		<sequence>
-			<element name="Attribute" type="metatype:Attribute"
-				minOccurs="0" maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="ocdref" type="string" use="required" />
-	</complexType>
-
-	<complexType name="Attribute">
-		<sequence>
-			<element name="Value" type="string" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="adref" type="string" use="required" />
-		<attribute name="content" type="string" use="optional" />
-	</complexType>
-
-	<complexType name="Designate">
-		<sequence>
-			<element name="Object" type="metatype:Object" minOccurs="1"
-				maxOccurs="1" />
-		</sequence>
-		<attribute name="pid" type="string" use="required" />
-		<attribute name="factoryPid" type="string" use="optional" />
-		<attribute name="bundle" type="string" use="optional" />
-		<attribute name="optional" type="boolean" default="false"
-			use="optional" />
-		<attribute name="merge" type="boolean" default="false"
-			use="optional" />
-	</complexType>
-
-	<simpleType name="Scalar">
-		<restriction base="string">
-			<enumeration value="String" />
-			<enumeration value="Long" />
-			<enumeration value="Double" />
-			<enumeration value="Float" />
-			<enumeration value="Integer" />
-			<enumeration value="Byte" />
-			<enumeration value="Char" />
-			<enumeration value="Boolean" />
-			<enumeration value="Short" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Option">
-		<attribute name="label" type="string" use="required" />
-		<attribute name="value" type="string" use="required" />
-	</complexType>
-
-	<complexType name="Icon">
-		<attribute name="resource" type="string" use="required" />
-		<attribute name="size" type="positiveInteger" use="required" />
-	</complexType>
-
-	<element name="MetaData" type="metatype:MetaData" />
-</schema>
\ No newline at end of file
diff --git a/osgi.enterprise/xmlns/metatype/v1.1.0/metatype.xsd b/osgi.enterprise/xmlns/metatype/v1.1.0/metatype.xsd
deleted file mode 100644
index 605c69c..0000000
--- a/osgi.enterprise/xmlns/metatype/v1.1.0/metatype.xsd
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	/*
-	* $Revision: 5655 $
-	* 
-	* Copyright (c) OSGi Alliance (2005, 2008). All Rights Reserved.
-	* 
-	* Licensed under the Apache License, Version 2.0 (the "License");
-	* you may not use this file except in compliance with the License.
-	* You may obtain a copy of the License at
-	*
-	*      http://www.apache.org/licenses/LICENSE-2.0
-	*
-	* Unless required by applicable law or agreed to in writing, software
-	* distributed under the License is distributed on an "AS IS" BASIS,
-	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	* See the License for the specific language governing permissions and
-	* limitations under the License.
-	*/
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0"
-	targetNamespace="http://www.osgi.org/xmlns/metatype/v1.1.0"
-	version="1.1.0">
-
-	<element name="MetaData" type="metatype:Tmetadata" />
-
-	<complexType name="Tmetadata">
-		<sequence>
-			<element name="OCD" type="metatype:Tocd" minOccurs="0"
-				maxOccurs="unbounded" />
-			<element name="Designate" type="metatype:Tdesignate"
-				minOccurs="0" maxOccurs="unbounded" />
-			<!-- It is non-deterministic, per W3C XML Schema 1.0: http://www.w3.org/TR/xmlschema-1/#cos-nonambig
-				to use namespace="##any" below. -->
-			<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="localization" type="string" use="optional" />
-		<anyAttribute />
-	</complexType>
-
-	<complexType name="Tocd">
-		<sequence>
-			<element name="AD" type="metatype:Tad" minOccurs="1"
-				maxOccurs="unbounded" />
-			<element name="Icon" type="metatype:Ticon" minOccurs="0"
-				maxOccurs="1" />
-			<!-- It is non-deterministic, per W3C XML Schema 1.0: http://www.w3.org/TR/xmlschema-1/#cos-nonambig
-				to use namespace="##any" below. -->
-			<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="string" use="required" />
-		<attribute name="description" type="string" use="optional" />
-		<attribute name="id" type="string" use="required" />
-		<anyAttribute />
-	</complexType>
-
-	<complexType name="Tad">
-		<sequence>
-			<element name="Option" type="metatype:Toption" minOccurs="0"
-				maxOccurs="unbounded" />
-			<!-- It is non-deterministic, per W3C XML Schema 1.0: http://www.w3.org/TR/xmlschema-1/#cos-nonambig
-				to use namespace="##any" below. -->
-			<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="string" use="optional" />
-		<attribute name="description" type="string" use="optional" />
-		<attribute name="id" type="string" use="required" />
-		<attribute name="type" type="metatype:Tscalar" use="required" />
-		<attribute name="cardinality" type="int" use="optional"
-			default="0" />
-		<attribute name="min" type="string" use="optional" />
-		<attribute name="max" type="string" use="optional" />
-		<attribute name="default" type="string" use="optional" />
-		<attribute name="required" type="boolean" use="optional"
-			default="true" />
-		<anyAttribute />
-	</complexType>
-
-	<complexType name="Tobject">
-		<sequence>
-			<element name="Attribute" type="metatype:Tattribute"
-				minOccurs="0" maxOccurs="unbounded" />
-			<!-- It is non-deterministic, per W3C XML Schema 1.0: http://www.w3.org/TR/xmlschema-1/#cos-nonambig
-				to use namespace="##any" below. -->
-			<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="ocdref" type="string" use="required" />
-		<anyAttribute />
-	</complexType>
-
-	<complexType name="Tattribute">
-		<sequence>
-			<element name="Value" type="string" minOccurs="0"
-				maxOccurs="unbounded" />
-			<!-- It is non-deterministic, per W3C XML Schema 1.0: http://www.w3.org/TR/xmlschema-1/#cos-nonambig
-				to use namespace="##any" below. -->
-			<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="adref" type="string" use="required" />
-		<attribute name="content" type="string" use="optional" />
-		<anyAttribute />
-	</complexType>
-
-	<complexType name="Tdesignate">
-		<sequence>
-			<element name="Object" type="metatype:Tobject" minOccurs="1"
-				maxOccurs="1" />
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="pid" type="string" use="required" />
-		<attribute name="factoryPid" type="string" use="optional" />
-		<attribute name="bundle" type="string" use="optional" />
-		<attribute name="optional" type="boolean" default="false"
-			use="optional" />
-		<attribute name="merge" type="boolean" default="false"
-			use="optional" />
-		<anyAttribute />
-	</complexType>
-
-	<simpleType name="Tscalar">
-		<restriction base="string">
-			<enumeration value="String" />
-			<enumeration value="Long" />
-			<enumeration value="Double" />
-			<enumeration value="Float" />
-			<enumeration value="Integer" />
-			<enumeration value="Byte" />
-			<enumeration value="Char" />
-			<enumeration value="Boolean" />
-			<enumeration value="Short" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Toption">
-		<sequence>
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="label" type="string" use="required" />
-		<attribute name="value" type="string" use="required" />
-		<anyAttribute />
-	</complexType>
-
-	<complexType name="Ticon">
-		<sequence>
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="resource" type="string" use="required" />
-		<attribute name="size" type="positiveInteger" use="required" />
-		<anyAttribute />
-	</complexType>
-
-	<attribute name="must-understand" type="boolean">
-		<annotation>
-			<documentation xml:lang="en">
-				This attribute should be used by extensions to documents
-				to require that the document consumer understand the
-				extension.
-			</documentation>
-		</annotation>
-	</attribute>
-</schema>
\ No newline at end of file
diff --git a/osgi.enterprise/xmlns/rsa/v1.0.0/rsa.xsd b/osgi.enterprise/xmlns/rsa/v1.0.0/rsa.xsd
deleted file mode 100644
index 46d73c4..0000000
--- a/osgi.enterprise/xmlns/rsa/v1.0.0/rsa.xsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-  <!--
-    /*
-     * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
-     *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     * http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
-  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:rsa="http://www.osgi.org/xmlns/rsa/v1.0.0"
-  targetNamespace="http://www.osgi.org/xmlns/rsa/v1.0.0"
-  elementFormDefault="qualified" version="1.0.0">
-
-  <annotation>
-    <documentation xml:lang="en">
-      This is the XML Schema for endpoint descriptions used by
-      the Remote Service Admin Specification. Endpoint descriptions
-      are used to describe remote services to a client in cases
-      where a real live Discovery system isn't used. An extender,
-      such as a local Discovery Service can look for service
-      descriptions in installed bundles and inform the Topology
-      Manager of these remote services. The Topology Manager can then
-      instruct the Remote Service Admin to create client proxies for
-      these services.
-    </documentation>
-  </annotation>
-
-  <element name="endpoint-descriptions" type="rsa:Tendpoint-descriptions" />
-
-  <complexType name="Tendpoint-descriptions">
-    <sequence>
-      <element name="endpoint-description" type="rsa:Tendpoint-description"
-               minOccurs="1" maxOccurs="unbounded" />
-        <!--
-          It is non-deterministic, per W3C XML Schema 1.0:
-          http://www.w3.org/TR/xmlschema-1/#cos-nonambig to use
-          namespace="##any" below.
-        -->
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-           processContents="lax" />
-    </sequence>
-    <anyAttribute />
-  </complexType>
-
-  <complexType name="Tendpoint-description">
-    <annotation>
-      <documentation xml:lang="en">
-        A Distribution Provider can register a proxy with the properties
-        provided. Whether or not it is instructed to do so, is up to the
-        Topology Manager. If any 'intents' properties are specified then the
-        Distribution Provider should only register a proxy if it can support 
-        those intents.
-      </documentation>
-    </annotation>
-    <sequence>
-      <element name="property" type="rsa:Tproperty" minOccurs="1"
-               maxOccurs="unbounded" />
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-           processContents="lax" />
-    </sequence>
-    <anyAttribute />
-  </complexType>
-
-  <complexType name="Tproperty" mixed="true">
-    <sequence>
-      <choice minOccurs="0" maxOccurs="1">
-        <element name="array" type="rsa:Tmulti-value"/>
-        <element name="list" type="rsa:Tmulti-value"/>
-        <element name="set" type="rsa:Tmulti-value"/>
-        <element name="xml" type="rsa:Txml"/>
-      </choice>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-           processContents="lax" />
-    </sequence>
-    <attribute name="name" type="string" use="required" />
-    <attribute name="value" type="string" use="optional" />
-    <attribute name="value-type" type="rsa:Tvalue-types" default="String" use="optional" />
-    <anyAttribute />
-  </complexType>
-  
-  <complexType name="Tmulti-value">
-    <sequence>
-      <element name="value" minOccurs="0" maxOccurs="unbounded" type="rsa:Tvalue"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-           processContents="lax" />      
-    </sequence>
-    <anyAttribute />
-  </complexType>
-  
-  <complexType name="Tvalue" mixed="true">
-    <sequence>
-      <element name="xml" minOccurs="0" maxOccurs="1" type="rsa:Txml"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-           processContents="lax" />      
-    </sequence>
-    <anyAttribute />
-  </complexType>
-  
-  <!-- Specifies the data type of a property or of the elements in a multi-value  
-       property. Numerical and boolean values are trimmed before they are processed.
-       Simple types are automatically boxed if needed. Only the array data type 
-       allows for simple type values. When specifying a simple type on any other 
-       type of property it will automatically be boxed. -->
-  <simpleType name="Tvalue-types">
-    <restriction base="string">
-      <enumeration value="String" />
-      <enumeration value="long" />
-      <enumeration value="Long" />
-      <enumeration value="double" />
-      <enumeration value="Double" />
-      <enumeration value="float" />
-      <enumeration value="Float" />
-      <enumeration value="int" />
-      <enumeration value="Integer" />
-      <enumeration value="byte" />
-      <enumeration value="Byte" />
-      <enumeration value="char" />
-      <enumeration value="Character" />
-      <enumeration value="boolean" />
-      <enumeration value="Boolean" />
-      <enumeration value="short" />
-      <enumeration value="Short" />
-    </restriction>
-  </simpleType>
-  
-  <!-- This complex type allows literal XML to be specified in an <xml/> tag (which 
-       is more convenient than putting it in a CDATA section). 
-       The embedded XML must be well-formed and not be in the rsa namespace. It will 
-       be put in a String value of a property or in an element of a multi-value 
-       property of base type String. The XML will be prefixed with the standard 
-       <?XML ?> header which is copied from the enclosing document. Hence it will 
-       carry the same version and encoding as the document in the rsa namespace. -->
-  <complexType name="Txml">
-    <sequence>
-      <any namespace="##other" minOccurs="1" maxOccurs="1"
-           processContents="lax" />
-    </sequence>
-    <anyAttribute />
-  </complexType>
-
-  <attribute name="must-understand" type="boolean" default="false">
-    <annotation>
-      <documentation xml:lang="en">
-        This attribute should be used by extensions to documents
-        to require that the document consumer understand the
-        extension.
-      </documentation>
-    </annotation>
-  </attribute>
-</schema>
diff --git a/osgi.enterprise/xmlns/scact/v1.0.0/scact.xsd b/osgi.enterprise/xmlns/scact/v1.0.0/scact.xsd
deleted file mode 100644
index f46560a..0000000
--- a/osgi.enterprise/xmlns/scact/v1.0.0/scact.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    /*
-    * Copyright (c) OSGi Alliance (2009). All Rights Reserved.
-    * 
-    * Licensed under the Apache License, Version 2.0 (the "License");
-    * you may not use this file except in compliance with the License.
-    * You may obtain a copy of the License at
-    *
-    *      http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing, software
-    * distributed under the License is distributed on an "AS IS" BASIS,
-    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    * See the License for the specific language governing permissions and
-    * limitations under the License.
-    */
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-  xmlns:scact="http://www.osgi.org/xmlns/scact/v1.0.0" targetNamespace="http://www.osgi.org/xmlns/scact/v1.0.0"
-  version="1.0.0" elementFormDefault="qualified">
-
-  <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="http://docs.oasis-open.org/opencsa/sca-assembly/sca-policy-1.1-cd02.xsd" />
-  <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="http://docs.oasis-open.org/opencsa/sca-assembly/sca-core-1.1-cd03.xsd" />
-
-  <annotation>
-    <documentation xml:lang="en">
-      This is the XML Schema for sca-config used by the
-      SCA configuration type specification. An instance of
-      an sca-config document can optionally contain bindings,
-      intents and policySets. These elements described the detailed
-      configuration for how the service should be made available (e.g. as a
-      soap/http Web service). The SCA specifications from OASIS define the
-      binding types which can be included in a bindings document and how
-      intents and policySets can provide detailed configuration for
-      policies.
-        </documentation>
-  </annotation>
-
-  <element name="sca-config" type="scact:Tsca-config" />
-
-  <complexType name="Tsca-config">
-    <choice minOccurs="0" maxOccurs="unbounded">
-      <element ref="sca:binding" />
-      <element ref="sca:intent" />
-      <element ref="sca:policySet" />
-    </choice>
-    <attribute name="targetNamespace" type="anyURI" use="required" />
-  </complexType>
-
-  <attribute name="must-understand" type="boolean" default="false">
-    <annotation>
-      <documentation xml:lang="en">
-        This attribute should be used by extensions to documents
-        to require that the document consumer understand the extension.
-      </documentation>
-    </annotation>
-  </attribute>
-</schema>
diff --git a/osgi.enterprise/xmlns/scr/v1.0.0/scr.xsd b/osgi.enterprise/xmlns/scr/v1.0.0/scr.xsd
deleted file mode 100644
index 9b1a13a..0000000
--- a/osgi.enterprise/xmlns/scr/v1.0.0/scr.xsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * $Revision: 5655 $
- * 
- * Copyright (c) OSGi Alliance (2005, 2008). All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->		
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.osgi.org/xmlns/scr/v1.0.0" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-	<annotation>
-		<documentation xml:lang="en">
-This is the XML Schema for component descriptions used by the Service Component Runtime (SCR).
-Component description documents may be embedded in other XML documents. The SCR will
-process all XML documents listed in the Service-Component manifest header of a bundle. 
-XML documents containing component descriptions may contain a single, root component 
-element or one or more component elements embedded in a larger document. Use of the 
-namespace is optional if the document only contains a root component element. In this 
-case, the scr namespace is assumed. Otherwise the namespace must be used.
-		</documentation>
-	</annotation>
-
-	<element name="component" type="scr:Tcomponent"/>
-
-	<complexType name="Tcomponent">
-		<annotation>
-			<documentation xml:lang="en">
-			Implementations of SCR must not require component descriptions to specify the subelements 
-			of the component element in the order as required by the schema. SCR implementations must 
-			allow other orderings since arbitrary orderings do not affect the meaning of the component 
-			description. Only the relative ordering of property and properties element have meaning.
-			</documentation>
-		</annotation>
-		<sequence>
-			<element name="implementation" type="scr:Timplementation" minOccurs="1" maxOccurs="1"/>
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element name="property" type="scr:Tproperty"/>
-				<element name="properties" type="scr:Tproperties"/>
-			</choice>
-			<element name="service" type="scr:Tservice" minOccurs="0" maxOccurs="1"/>
-			<element name="reference" type="scr:Treference" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="enabled" type="boolean" default="true" use="optional"/>
-		<attribute name="name" type="token" use="required"/>
-		<attribute name="factory" type="string" use="optional"/>
-		<attribute name="immediate" type="boolean" use="optional"/>
-	</complexType>
-
-	<complexType name="Timplementation">
-		<attribute name="class" type="token" use="required"/>
-	</complexType>
-
-	<complexType name="Tproperty">
-		<simpleContent>
-			<extension base="string">
-				<attribute name="name" type="string" use="required"/>
-				<attribute name="value" type="string" use="optional"/>
-				<attribute name="type" type="scr:Tjava-types" default="String" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-
-	<complexType name="Tproperties">
-		<attribute name="entry" type="string" use="required"/>
-	</complexType>
-
-	<complexType name="Tservice">
-		<sequence>
-			<element name="provide" type="scr:Tprovide" minOccurs="1" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="servicefactory" type="boolean" default="false" use="optional"/>
-	</complexType>
-
-	<complexType name="Tprovide">
-		<attribute name="interface" type="token" use="required"/>
-	</complexType>
-
-	<complexType name="Treference">
-		<attribute name="name" type="NMTOKEN" use="required"/>
-		<attribute name="interface" type="token" use="required"/>
-		<attribute name="cardinality" type="scr:Tcardinality" default="1..1" use="optional"/>
-		<attribute name="policy" type="scr:Tpolicy" default="static" use="optional"/>
-		<attribute name="target" type="string" use="optional"/>
-		<attribute name="bind" type="token" use="optional"/>
-		<attribute name="unbind" type="token" use="optional"/>
-	</complexType>
-
-	<simpleType name="Tjava-types">
-		<restriction base="string">
-			<enumeration value="String"/>
-			<enumeration value="Long"/>
-			<enumeration value="Double"/>
-			<enumeration value="Float"/>
-			<enumeration value="Integer"/>
-			<enumeration value="Byte"/>
-			<enumeration value="Character"/>
-			<enumeration value="Boolean"/>
-			<enumeration value="Short"/>
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Tcardinality">
-		<restriction base="string">
-			<enumeration value="0..1"/>
-			<enumeration value="0..n"/>
-			<enumeration value="1..1"/>
-			<enumeration value="1..n"/>
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Tpolicy">
-		<restriction base="string">
-			<enumeration value="static"/>
-			<enumeration value="dynamic"/>
-		</restriction>
-	</simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/osgi.enterprise/xmlns/scr/v1.1.0/scr.xsd b/osgi.enterprise/xmlns/scr/v1.1.0/scr.xsd
deleted file mode 100644
index 8ada1db..0000000
--- a/osgi.enterprise/xmlns/scr/v1.1.0/scr.xsd
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<!--
-	/*
-	* $Revision: 7533 $
-	* 
-	* Copyright (c) OSGi Alliance (2005, 2009). All Rights Reserved.
-	* 
-	* Licensed under the Apache License, Version 2.0 (the "License");
-	* you may not use this file except in compliance with the License.
-	* You may obtain a copy of the License at
-	*
-	*      http://www.apache.org/licenses/LICENSE-2.0
-	*
-	* Unless required by applicable law or agreed to in writing, software
-	* distributed under the License is distributed on an "AS IS" BASIS,
-	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	* See the License for the specific language governing permissions and
-	* limitations under the License.
-	*/
-	-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
-	targetNamespace="http://www.osgi.org/xmlns/scr/v1.1.0"
-	elementFormDefault="unqualified"
-	attributeFormDefault="unqualified"
-	version="1.1.0">
-
-	<annotation>
-		<documentation xml:lang="en">
-			This is the XML Schema for component descriptions used by
-			the Service Component Runtime (SCR). Component description
-			documents may be embedded in other XML documents. SCR will
-			process all XML documents listed in the Service-Component
-			manifest header of a bundle. XML documents containing
-			component descriptions may contain a single, root component
-			element or one or more component elements embedded in a
-			larger document. Use of the namespace for component 
-			descriptions is mandatory. The attributes and subelements 
-			of a component element are always unqualified.
-		</documentation>
-	</annotation>
-	<element name="component" type="scr:Tcomponent" />
-	<complexType name="Tcomponent">
-		<sequence>
-			<annotation>
-				<documentation xml:lang="en">
-					Implementations of SCR must not require component
-					descriptions to specify the subelements of the component
-					element in the order as required by the schema. SCR
-					implementations must allow other orderings since
-					arbitrary orderings do not affect the meaning of the
-					component description. Only the relative ordering of
-					property and properties element have meaning.
-				</documentation>
-			</annotation>
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element name="property" type="scr:Tproperty" />
-				<element name="properties" type="scr:Tproperties" />
-			</choice>
-			<element name="service" type="scr:Tservice" minOccurs="0"
-				maxOccurs="1" />
-			<element name="reference" type="scr:Treference"
-				minOccurs="0" maxOccurs="unbounded" />
-			<element name="implementation" type="scr:Timplementation"
-				minOccurs="1" maxOccurs="1" />
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="enabled" type="boolean" default="true"
-			use="optional" />
-		<attribute name="name" type="token" use="optional">
-			<annotation>
-				<documentation xml:lang="en">
-					The default value of this attribute is the value of
-					the class attribute of the nested implementation
-					element. If multiple component elements use the same 
-					value for the class attribute of their nested 
-					implementation element, then using the default value 
-					for this attribute will result in duplicate names. 
-					In this case, this attribute must be specified with 
-					a unique value.
-				</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="factory" type="string" use="optional" />
-		<attribute name="immediate" type="boolean" use="optional" />
-		<attribute name="configuration-policy"
-			type="scr:Tconfiguration-policy" default="optional" use="optional" />
-		<attribute name="activate" type="token" use="optional"
-			default="activate" />
-		<attribute name="deactivate" type="token" use="optional"
-			default="deactivate" />
-		<attribute name="modified" type="token" use="optional" />
-		<anyAttribute />
-	</complexType>
-	<complexType name="Timplementation">
-		<sequence>
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="class" type="token" use="required" />
-		<anyAttribute />
-	</complexType>
-	<complexType name="Tproperty">
-		<simpleContent>
-			<extension base="string">
-				<attribute name="name" type="string" use="required" />
-				<attribute name="value" type="string" use="optional" />
-				<attribute name="type" type="scr:Tjava-types"
-					default="String" use="optional" />
-				<anyAttribute />
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="Tproperties">
-		<sequence>
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="entry" type="string" use="required" />
-		<anyAttribute />
-	</complexType>
-	<complexType name="Tservice">
-		<sequence>
-			<element name="provide" type="scr:Tprovide" minOccurs="1"
-				maxOccurs="unbounded" />
-			<!-- It is non-deterministic, per W3C XML Schema 1.0: 
-			http://www.w3.org/TR/xmlschema-1/#cos-nonambig
-			to use name space="##any" below. -->
-			<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="servicefactory" type="boolean" default="false"
-			use="optional" />
-		<anyAttribute />
-	</complexType>
-	<complexType name="Tprovide">
-		<sequence>
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="interface" type="token" use="required" />
-		<anyAttribute />
-	</complexType>
-	<complexType name="Treference">
-		<sequence>
-			<any namespace="##any" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="token" use="optional">
-			<annotation>
-				<documentation xml:lang="en">
-					The default value of this attribute is the value of
-					the interface attribute of this element. If multiple 
-					instances of this element within a component element 
-					use the same value for the interface attribute, then 
-					using the default value for this attribute will result 
-					in duplicate names. In this case, this attribute 
-					must be specified with a unique value.
-				</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="interface" type="token" use="required" />
-		<attribute name="cardinality" type="scr:Tcardinality"
-			default="1..1" use="optional" />
-		<attribute name="policy" type="scr:Tpolicy" default="static"
-			use="optional" />
-		<attribute name="target" type="string" use="optional" />
-		<attribute name="bind" type="token" use="optional" />
-		<attribute name="unbind" type="token" use="optional" />
-		<anyAttribute />
-	</complexType>
-	<simpleType name="Tjava-types">
-		<restriction base="string">
-			<enumeration value="String" />
-			<enumeration value="Long" />
-			<enumeration value="Double" />
-			<enumeration value="Float" />
-			<enumeration value="Integer" />
-			<enumeration value="Byte" />
-			<enumeration value="Character" />
-			<enumeration value="Boolean" />
-			<enumeration value="Short" />
-		</restriction>
-	</simpleType>
-	<simpleType name="Tcardinality">
-		<restriction base="string">
-			<enumeration value="0..1" />
-			<enumeration value="0..n" />
-			<enumeration value="1..1" />
-			<enumeration value="1..n" />
-		</restriction>
-	</simpleType>
-	<simpleType name="Tpolicy">
-		<restriction base="string">
-			<enumeration value="static" />
-			<enumeration value="dynamic" />
-		</restriction>
-	</simpleType>
-	<simpleType name="Tconfiguration-policy">
-		<restriction base="string">
-			<enumeration value="optional" />
-			<enumeration value="require" />
-			<enumeration value="ignore" />
-		</restriction>
-	</simpleType>
-	<attribute name="must-understand" type="boolean">
-		<annotation>
-			<documentation xml:lang="en">
-				This attribute should be used by extensions to documents
-				to require that the document consumer understand the
-				extension. This attribute must be qualified when used.
-			</documentation>
-		</annotation>
-	</attribute>
-</schema>