geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r990612 [1/8] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.jee.v22.jaxbmodel/ org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/...
Date Sun, 29 Aug 2010 18:06:32 GMT
Author: delos
Date: Sun Aug 29 18:06:29 2010
New Revision: 990612

URL: http://svn.apache.org/viewvc?rev=990612&view=rev
Log:
GERONIMODEVTOOLS-636 refactor code to fix issues in 2.x adapters

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/attributes-1.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/blueprint.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-application-2.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-application-client-2.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-connector-1.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-credential-store-1.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-jaspi.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-javabean-xmlattribute-1.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-jetty-2.0.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-jetty-config-1.0.1.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-login-config-2.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-module-1.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-naming-1.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-openejb-2.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-security-1.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-security-2.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-subject-info-1.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-tomcat-2.0.1.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-tomcat-config-1.0.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/geronimo-web-2.0.1.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/openejb-jar-2.2.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/pkgen-2.1.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/plugins-1.3.xsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/Activator.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoV20ServerInfo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoV20VersionHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/internal/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/internal/Trace.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/schema/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/schema/geronimoinfo.exsd
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfoManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21ServerInfo.java
      - copied, changed from r990310, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/IGeronimoServerInfo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/Activator.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22VersionHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java
Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v22.jaxbmodel/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/IGeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/SharedDeploymentPlanEditor.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/IGeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IGeronimoServerPluginManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/pages/AbstractGeronimoFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ServerPluginPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/AbstractGeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPlanSourcePage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/NamingFormPage.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/IGeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/IGeronimoServer.java?rev=990612&r1=990611&r2=990612&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/IGeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/IGeronimoServer.java Sun Aug 29 18:06:29 2010
@@ -67,5 +67,5 @@ public interface IGeronimoServer extends
 	public long getPublishTimeout();
 	
 	public IGeronimoServerPluginManager getServerPluginManager();
-
+	
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IGeronimoServerPluginManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IGeronimoServerPluginManager.java?rev=990612&r1=990611&r2=990612&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IGeronimoServerPluginManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IGeronimoServerPluginManager.java Sun Aug 29 18:06:29 2010
@@ -17,12 +17,44 @@
 
 package org.apache.geronimo.st.core.operations;
 
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 public interface IGeronimoServerPluginManager {
-	public List<String> getPluginList();
+    public List<String> getPluginList();
 
-	public void assembleServer(String group, String artifact, String version,
-			String format, String relativeServerPath, int[] selected);
+    public void assembleServer(String group, String artifact, String version, String format, String relativeServerPath,
+            int[] selected);
+
+    public void addGeronimoDependencies(Object data, List deps, boolean includeVersion);
+
+    public void exportCAR(String localRepoDir, String configId) throws Exception;
+
+    public List<String> getConfigurationList();
+
+    public Object getPluginMetadata(String configId);
+
+    public ArrayList<String> installPlugins(String localRepoDir, List pluginList);
+
+    public Object loadPluginList(InputStream in);
+
+    public Object readPluginList(String localRepoDir);
+
+    public void savePluginXML(String configId, Object metadata);
+
+    public Object toArtifact(Object id);
+
+    public Object toArtifactType(Object id);
+
+    public Object toArtifactType(String configId);
+
+    public Object toDependencyType(Object dep, boolean includeVersion);
+
+    public Object toDependencyType(String configId);
+
+    public void updatePluginList(String localRepoDir, Object metadata) throws Exception;
+
+    public boolean validatePlugin(Object plugin);
 
 }

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/attributes-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/attributes-1.2.xsd?rev=990612&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/attributes-1.2.xsd (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/attributes-1.2.xsd Sun Aug 29 18:06:29 2010
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!-- $Rev: 673951 $ $Date: 2008-07-04 16:10:56 +0800 (Fri, 04 Jul 2008) $ -->
+
+<xsd:schema targetNamespace="http://geronimo.apache.org/xml/ns/attributes-1.2"
+    xmlns:atts="http://geronimo.apache.org/xml/ns/attributes-1.2"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+    <xsd:annotation>
+        <xsd:documentation>
+            This is an XML Schema Definition for storing manageable attribute
+            values. All the schema's or plans using elements of this schema must
+            specify the top level element with one of the namespace specified as
+            "http://geronimo.apache.org/xml/ns/attributes-1.2". The default
+            location for this document is:
+            http://geronimo.apache.org/xml/ns/attributes-1.2
+
+            The definition of the XML format for storing manageable attribute
+            values. Should look like this:
+            <![CDATA[
+            <attributes>
+                <comment>Comment for the whole attribute</comment>
+                <module name="mygroup/mycomponent/1.1/jar">
+                    <comment>Comment specific to the module</comment>
+                    <gbean name="MyNetworkService">
+                        <comment>Comment for the gbean</comment>
+                        <attribute name="host">0.0.0.0</attribute>
+                        <attribute name="port">1234</attribute>
+                    </gbean>
+                </module>
+            </attributes>
+            ]]>
+        </xsd:documentation>
+    </xsd:annotation>
+
+    <!-- Main element for the manageable attribute store configuration -->
+    <xsd:element name="attributes" type="atts:attributesType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provides the definition of named attributes. Attributes are
+                mixed type and can include simple text and elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="gbean" type="atts:gbeanType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Element used by the plugin system to list individual GBeans.
+                Note that the name attribute for a gbean element may hold either
+                the full GBeanName, or only the value for the "name=" portion of
+                the GBeanName. If there are multiple GBeans in the module with
+                manageable attributes and the same "name=" portion of the
+                GBeanName, then all must be listed and all must be listed with a
+                full GBeanName.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="attribute" type="atts:attributeType">
+        <xsd:annotation>
+            <xsd:documentation>
+                gbean attribute as an element for ease in jaxb serialization to string.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="comment" type="xsd:string"/>
+
+    <xsd:complexType name="attributesType">
+        <xsd:sequence>
+            <xsd:element name="comment" type="xsd:string" minOccurs="0"
+                maxOccurs="1" />
+            <xsd:choice>
+                <xsd:element name="module" type="atts:moduleType" minOccurs="0"
+                    maxOccurs="unbounded" />
+
+                <!-- The config.xml file in 1.0 use configuration instead of module -->
+                <xsd:element name="configuration" type="atts:moduleType"
+                   minOccurs="0" maxOccurs="unbounded" />
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="moduleType">
+        <xsd:sequence>
+            <xsd:element name="comment" type="xsd:string" minOccurs="0"
+                maxOccurs="1" />
+            <xsd:element name="gbean" type="atts:gbeanType" minOccurs="0"
+                maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="load" type="xsd:boolean" use="optional"
+            default="true" />
+        <xsd:attribute name="condition" type="xsd:string" use="optional" />
+    </xsd:complexType>
+
+    <xsd:complexType name="gbeanType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Element used by the plugin system to list individual GBeans.
+                Note that the name attribute for a gbean element may hold either
+                the full GBeanName, or only the value for the "name=" portion of
+                the GBeanName. If there are multiple GBeans in the module with
+                manageable attributes and the same "name=" portion of the
+                GBeanName, then all must be listed and all must be listed with a
+                full GBeanName.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="comment" type="xsd:string" minOccurs="0"
+                maxOccurs="1" />
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element ref="atts:attribute" />
+                <xsd:element name="reference" type="atts:referenceType" />
+            </xsd:choice>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name attribute specifies the name portion of the
+                    GBeanName.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="gbeanInfo" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The gbeanInfo attribute provide the gbean infomation for
+                    specified GBean.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="load" type="xsd:boolean" use="optional"
+            default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The load attribute specifies if the gbean is to be loaded or
+                    not.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="attributeType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provides the definition of a single named attribute. Attributes
+                are mixed type and can include simple text and elements.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent mixed="true">
+            <xsd:restriction base="xsd:anyType">
+                <xsd:sequence>
+                    <xsd:any minOccurs="0" maxOccurs="unbounded"
+                        processContents="lax" />
+                </xsd:sequence>
+                <xsd:attribute name="name" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name attribute provides the name of single
+                            attribute.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="null" use="optional" type="xsd:boolean" default="false">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The null attribute defines if this atribute is null
+                            or not.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="propertyEditor" use="optional" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The propertyEditor attribute defines the property editor class
+                            to be used to get the value of this attribute based on its
+                            string representation.
+                            
+                            If no editor is specified, then the type of the attribute, as
+                            declared by GBeanAttribute, is used to find a propertyEditor
+                            through the standard JavaBean search strategy.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <!--<xsd:attribute name="value" use="optional">-->
+                    <!--<xsd:annotation>-->
+                        <!--<xsd:documentation>-->
+                            <!--The value attribute is the value of specified-->
+                            <!--attribute.-->
+                        <!--</xsd:documentation>-->
+                    <!--</xsd:annotation>-->
+                <!--</xsd:attribute>-->
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="referenceType">
+        <xsd:sequence>
+            <xsd:element name="pattern" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="groupId" type="xsd:string"
+                            minOccurs="0">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    The name for group containing module to
+                                    match. By default is set to wild card '*'.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element name="artifactId" type="xsd:string"
+                            minOccurs="0">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    The name for module in a specified group to
+                                    be matched. All the artifactId's should be
+                                    unique within a group. If no articfactId is
+                                    provided it will be defaulted to file name
+                                    of the module file.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element name="version" type="xsd:string"
+                            minOccurs="0">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    The version number for the module formatted
+                                    by dot separated numbers. If no version is
+                                    provided it will be defaulted to latest
+                                    available version matching other criterions.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element name="type" type="xsd:string"
+                            minOccurs="0">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    This element defines the type of the module.
+                                    The type could be 'CAR', 'JAR', EAR', 'WAR'
+                                    etc. If no type is provided it will be
+                                    defaulted appropriately by the deployer
+                                    depending upon type of deployed module.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element name="module" type="xsd:string"
+                            minOccurs="0">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    The value specified here should match the
+                                    file name of the module referenced.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element name="name" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    The name element to identify the referenced
+                                    GBean by name.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                        </xsd:element>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string" />
+    </xsd:complexType>
+</xsd:schema>

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/blueprint.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/blueprint.xsd?rev=990612&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/blueprint.xsd (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/v30/blueprint.xsd Sun Aug 29 18:06:29 2010
@@ -0,0 +1,1233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    /*
+    * $Revision: 948300 $
+    *
+    * 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>



Mime
View raw message