Add local cache for external XSDs referenced by SCA specs

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@783211 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 1241 insertions, 128 deletions

diff --git a/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
index 276bdc9214..cabc686fcf 100644
--- a/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-DocURL: http://www.apache.org/

 Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xsd

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Export-Package: org.apache.tuscany.sca.assembly.xsd;version="2.0.0"

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
new file mode 100644
index 0000000000..7596dc5dc1
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.

+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.

+Copyright © OASIS Open 2002-2004. All Rights Reserved.

+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.

+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.

+This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

+-->

+<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">

+	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>

+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

+	<xsd:complexType name="AttributedString">

+		<xsd:annotation>

+			<xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="xsd:string">

+				<xsd:attribute ref="wsu:Id"/>

+				<xsd:anyAttribute namespace="##other" processContents="lax"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<xsd:complexType name="PasswordString">

+		<xsd:annotation>

+			<xsd:documentation>This type is used for password elements per Section 4.1.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="wsse:AttributedString">

+				<xsd:attribute name="Type" type="xsd:anyURI"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<xsd:complexType name="EncodedString">

+		<xsd:annotation>

+			<xsd:documentation>This type is used for elements containing stringified binary data.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="wsse:AttributedString">

+				<xsd:attribute name="EncodingType" type="xsd:anyURI"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<xsd:complexType name="UsernameTokenType">

+		<xsd:annotation>

+			<xsd:documentation>This type represents a username token per Section 4.1</xsd:documentation>

+		</xsd:annotation>

+		<xsd:sequence>

+			<xsd:element name="Username" type="wsse:AttributedString"/>

+			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+		</xsd:sequence>

+		<xsd:attribute ref="wsu:Id"/>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:complexType>

+	<xsd:complexType name="BinarySecurityTokenType">

+		<xsd:annotation>

+			<xsd:documentation>A security token that is encoded in binary</xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="wsse:EncodedString">

+				<xsd:attribute name="ValueType" type="xsd:anyURI"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<xsd:complexType name="KeyIdentifierType">

+		<xsd:annotation>

+			<xsd:documentation>A security token key identifier</xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="wsse:EncodedString">

+				<xsd:attribute name="ValueType" type="xsd:anyURI"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<xsd:simpleType name="tUsage">

+		<xsd:annotation>

+			<xsd:documentation>Typedef to allow a list of usages (as URIs).</xsd:documentation>

+		</xsd:annotation>

+		<xsd:list itemType="xsd:anyURI"/>

+	</xsd:simpleType>

+	<xsd:attribute name="Usage" type="tUsage">

+		<xsd:annotation>

+			<xsd:documentation>This global attribute is used to indicate the usage of a referenced or indicated token within the containing context</xsd:documentation>

+		</xsd:annotation>

+	</xsd:attribute>

+	<xsd:complexType name="ReferenceType">

+		<xsd:annotation>

+			<xsd:documentation>This type represents a reference to an external security token.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:attribute name="URI" type="xsd:anyURI"/>

+		<xsd:attribute name="ValueType" type="xsd:anyURI"/>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:complexType>

+	<xsd:complexType name="EmbeddedType">

+		<xsd:annotation>

+			<xsd:documentation>This type represents a reference to an embedded security token.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:choice minOccurs="0" maxOccurs="unbounded">

+			<xsd:any processContents="lax"/>

+		</xsd:choice>

+		<xsd:attribute name="ValueType" type="xsd:anyURI"/>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:complexType>

+	<xsd:complexType name="SecurityTokenReferenceType">

+		<xsd:annotation>

+			<xsd:documentation>This type is used reference a security token.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:choice minOccurs="0" maxOccurs="unbounded">

+			<xsd:any processContents="lax"/>

+		</xsd:choice>

+		<xsd:attribute ref="wsu:Id"/>

+		<xsd:attribute ref="wsse:Usage"/>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:complexType>

+	<xsd:complexType name="SecurityHeaderType">

+		<xsd:annotation>

+			<xsd:documentation>This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:sequence>

+			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">

+				<xsd:annotation>

+					<xsd:documentation>The use of "any" is to allow extensibility and different forms of security data.</xsd:documentation>

+				</xsd:annotation>

+			</xsd:any>

+		</xsd:sequence>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:complexType>

+	<xsd:complexType name="TransformationParametersType">

+		<xsd:annotation>

+			<xsd:documentation>This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.</xsd:documentation>

+		</xsd:annotation>

+		<xsd:sequence>

+			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">

+				<xsd:annotation>

+					<xsd:documentation>The use of "any" is to allow extensibility from any namespace.</xsd:documentation>

+				</xsd:annotation>

+			</xsd:any>

+		</xsd:sequence>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:complexType>

+	<xsd:element name="UsernameToken" type="wsse:UsernameTokenType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines the wsse:UsernameToken element per Section 4.1.</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines the wsse:BinarySecurityToken element per Section 4.2.</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="Reference" type="wsse:ReferenceType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines a security token reference</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="Embedded" type="wsse:EmbeddedType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines a security token embedded reference</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="KeyIdentifier" type="wsse:KeyIdentifierType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines a key identifier reference</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="SecurityTokenReference" type="wsse:SecurityTokenReferenceType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines the wsse:SecurityTokenReference per Section 4.3.</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="Security" type="wsse:SecurityHeaderType">

+		<xsd:annotation>

+			<xsd:documentation>This element defines the wsse:Security SOAP header element per Section 4.</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="TransformationParameters" type="wsse:TransformationParametersType">

+		<xsd:annotation>

+			<xsd:documentation>This element contains properties for transformations from any namespace, including DSIG.</xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="Password" type="wsse:PasswordString"/>

+	<xsd:element name="Nonce" type="wsse:EncodedString"/>

+	<xsd:simpleType name="FaultcodeEnum">

+		<xsd:restriction base="xsd:QName">

+			<xsd:enumeration value="wsse:UnsupportedSecurityToken"/>

+			<xsd:enumeration value="wsse:UnsupportedAlgorithm"/>

+			<xsd:enumeration value="wsse:InvalidSecurity"/>

+			<xsd:enumeration value="wsse:InvalidSecurityToken"/>

+			<xsd:enumeration value="wsse:FailedAuthentication"/>

+			<xsd:enumeration value="wsse:FailedCheck"/>

+			<xsd:enumeration value="wsse:SecurityTokenUnavailable"/>

+		</xsd:restriction>

+	</xsd:simpleType>

+</xsd:schema>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
new file mode 100644
index 0000000000..e088d137e4
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.

+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.

+Copyright © OASIS Open 2002-2004. All Rights Reserved.

+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.

+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.

+This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

+-->

+<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

+

+

+

+xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

+elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">

+	<!-- // Fault Codes /////////////////////////////////////////// -->

+	<xsd:simpleType name="tTimestampFault">

+		<xsd:annotation>

+			<xsd:documentation>

+This type defines the fault code value for Timestamp message expiration.

+          </xsd:documentation>

+		</xsd:annotation>

+		<xsd:restriction base="xsd:QName">

+			<xsd:enumeration value="wsu:MessageExpired"/>

+		</xsd:restriction>

+	</xsd:simpleType>

+	<!-- // Global attributes //////////////////////////////////// -->

+	<xsd:attribute name="Id" type="xsd:ID">

+		<xsd:annotation>

+			<xsd:documentation>

+This global attribute supports annotating arbitrary elements with an ID.

+          </xsd:documentation>

+		</xsd:annotation>

+	</xsd:attribute>

+	<xsd:attributeGroup name="commonAtts">

+		<xsd:annotation>

+			<xsd:documentation>

+Convenience attribute group used to simplify this schema.

+          </xsd:documentation>

+		</xsd:annotation>

+		<xsd:attribute ref="wsu:Id" use="optional"/>

+		<xsd:anyAttribute namespace="##other" processContents="lax"/>

+	</xsd:attributeGroup>

+	<!-- // Utility types //////////////////////////////////////// -->

+	<xsd:complexType name="AttributedDateTime">

+		<xsd:annotation>

+			<xsd:documentation>

+This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. 

+      </xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="xsd:string">

+				<xsd:attributeGroup ref="wsu:commonAtts"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<xsd:complexType name="AttributedURI">

+		<xsd:annotation>

+			<xsd:documentation>

+This type is for elements whose [children] is an anyURI and can have arbitrary attributes.

+      </xsd:documentation>

+		</xsd:annotation>

+		<xsd:simpleContent>

+			<xsd:extension base="xsd:anyURI">

+				<xsd:attributeGroup ref="wsu:commonAtts"/>

+			</xsd:extension>

+		</xsd:simpleContent>

+	</xsd:complexType>

+	<!-- // Timestamp header components /////////////////////////// -->

+	<xsd:complexType name="TimestampType">

+		<xsd:annotation>

+			<xsd:documentation>

+This complex type ties together the timestamp related elements into a composite type.

+            </xsd:documentation>

+		</xsd:annotation>

+		<xsd:sequence>

+			<xsd:element ref="wsu:Created" minOccurs="0"/>

+			<xsd:element ref="wsu:Expires" minOccurs="0"/>

+			<xsd:choice minOccurs="0" maxOccurs="unbounded">

+				<xsd:any namespace="##other" processContents="lax"/>

+			</xsd:choice>

+		</xsd:sequence>

+		<xsd:attributeGroup ref="wsu:commonAtts"/>

+	</xsd:complexType>

+	<xsd:element name="Timestamp" type="wsu:TimestampType">

+		<xsd:annotation>

+			<xsd:documentation>

+This element allows Timestamps to be applied anywhere element wildcards are present,

+including as a SOAP header.

+            </xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<!-- global element decls to allow individual elements to appear anywhere -->

+	<xsd:element name="Expires" type="wsu:AttributedDateTime">

+		<xsd:annotation>

+			<xsd:documentation>

+This element allows an expiration time to be applied anywhere element wildcards are present.

+            </xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+	<xsd:element name="Created" type="wsu:AttributedDateTime">

+		<xsd:annotation>

+			<xsd:documentation>

+This element allows a creation time to be applied anywhere element wildcards are present.

+            </xsd:documentation>

+		</xsd:annotation>

+	</xsd:element>

+</xsd:schema>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
new file mode 100644
index 0000000000..d4f272ec7f
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!--

+    W3C XML Schema defined in the Web Services Addressing 1.0 specification

+    http://www.w3.org/TR/ws-addr-core

+

+   Copyright © 2005 World Wide Web Consortium,

+

+   (Massachusetts Institute of Technology, European Research Consortium for

+   Informatics and Mathematics, Keio University). All Rights Reserved. This

+   work is distributed under the W3C® Software License [1] in the hope that

+   it will be useful, but WITHOUT ANY WARRANTY; without even the implied

+   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+

+   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231

+

+   $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $

+-->

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">

+

+    <!-- Constructs from the WS-Addressing Core -->

+

+    <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>

+    <xs:complexType name="EndpointReferenceType" mixed="false">

+        <xs:sequence>

+            <xs:element name="Address" type="tns:AttributedURIType"/>

+            <xs:element ref="tns:ReferenceParameters" minOccurs="0"/>

+            <xs:element ref="tns:Metadata" minOccurs="0"/>

+            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+        </xs:sequence>

+        <xs:anyAttribute namespace="##other" processContents="lax"/>

+    </xs:complexType>

+

+    <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>

+    <xs:complexType name="ReferenceParametersType" mixed="false">

+        <xs:sequence>

+            <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+        </xs:sequence>

+        <xs:anyAttribute namespace="##other" processContents="lax"/>

+    </xs:complexType>

+

+    <xs:element name="Metadata" type="tns:MetadataType"/>

+    <xs:complexType name="MetadataType" mixed="false">

+        <xs:sequence>

+            <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+        </xs:sequence>

+        <xs:anyAttribute namespace="##other" processContents="lax"/>

+    </xs:complexType>

+

+    <xs:element name="MessageID" type="tns:AttributedURIType"/>

+    <xs:element name="RelatesTo" type="tns:RelatesToType"/>

+    <xs:complexType name="RelatesToType" mixed="false">

+        <xs:simpleContent>

+            <xs:extension base="xs:anyURI">

+                <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>

+                <xs:anyAttribute namespace="##other" processContents="lax"/>

+            </xs:extension>

+        </xs:simpleContent>

+    </xs:complexType>

+

+    <xs:simpleType name="RelationshipTypeOpenEnum">

+        <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>

+    </xs:simpleType>

+

+    <xs:simpleType name="RelationshipType">

+        <xs:restriction base="xs:anyURI">

+            <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>

+        </xs:restriction>

+    </xs:simpleType>

+

+    <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>

+    <xs:element name="From" type="tns:EndpointReferenceType"/>

+    <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>

+    <xs:element name="To" type="tns:AttributedURIType"/>

+    <xs:element name="Action" type="tns:AttributedURIType"/>

+

+    <xs:complexType name="AttributedURIType" mixed="false">

+        <xs:simpleContent>

+            <xs:extension base="xs:anyURI">

+                <xs:anyAttribute namespace="##other" processContents="lax"/>

+            </xs:extension>

+        </xs:simpleContent>

+    </xs:complexType>

+

+    <!-- Constructs from the WS-Addressing SOAP binding -->

+

+    <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>

+

+    <xs:simpleType name="FaultCodesOpenEnumType">

+        <xs:union memberTypes="tns:FaultCodesType xs:QName"/>

+    </xs:simpleType>

+

+    <xs:simpleType name="FaultCodesType">

+        <xs:restriction base="xs:QName">

+            <xs:enumeration value="tns:InvalidAddressingHeader"/>

+            <xs:enumeration value="tns:InvalidAddress"/>

+            <xs:enumeration value="tns:InvalidEPR"/>

+            <xs:enumeration value="tns:InvalidCardinality"/>

+            <xs:enumeration value="tns:MissingAddressInEPR"/>

+            <xs:enumeration value="tns:DuplicateMessageID"/>

+            <xs:enumeration value="tns:ActionMismatch"/>

+            <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>

+            <xs:enumeration value="tns:DestinationUnreachable"/>

+            <xs:enumeration value="tns:ActionNotSupported"/>

+            <xs:enumeration value="tns:EndpointUnavailable"/>

+        </xs:restriction>

+    </xs:simpleType>

+

+    <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>

+    <xs:complexType name="AttributedUnsignedLongType" mixed="false">

+        <xs:simpleContent>

+            <xs:extension base="xs:unsignedLong">

+                <xs:anyAttribute namespace="##other" processContents="lax"/>

+            </xs:extension>

+        </xs:simpleContent>

+    </xs:complexType>

+

+    <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>

+    <xs:complexType name="AttributedQNameType" mixed="false">

+        <xs:simpleContent>

+            <xs:extension base="xs:QName">

+                <xs:anyAttribute namespace="##other" processContents="lax"/>

+            </xs:extension>

+        </xs:simpleContent>

+    </xs:complexType>

+

+    <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>

+

+    <xs:element name="ProblemAction" type="tns:ProblemActionType"/>

+    <xs:complexType name="ProblemActionType" mixed="false">

+        <xs:sequence>

+            <xs:element ref="tns:Action" minOccurs="0"/>

+            <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>

+        </xs:sequence>

+        <xs:anyAttribute namespace="##other" processContents="lax"/>

+    </xs:complexType>

+

+</xs:schema>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
new file mode 100644
index 0000000000..8d4bd32fc4
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
@@ -0,0 +1,141 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!--

+

+    W3C XML Schema defined in the Web Services Policy 1.5

+    Framework specification

+

+    http://www.w3.org/TR/ws-policy-framework

+

+   Copyright © 2006 World Wide Web Consortium,

+

+   (Massachusetts Institute of Technology, European Research Consortium for

+   Informatics and Mathematics, Keio University). All Rights Reserved. This

+   work is distributed under the W3C® Software License [1] in the hope that

+   it will be useful, but WITHOUT ANY WARRANTY; without even the implied

+   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+

+   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231

+

+   $Id: ws-policy.xsd,v 1.2 2007/02/14 16:38:37 fsasaki Exp $

+-->

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"

+    xmlns:tns="http://www.w3.org/ns/ws-policy"

+    xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"

+    xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"

+    targetNamespace="http://www.w3.org/ns/ws-policy" blockDefault="#all"

+    elementFormDefault="qualified">

+

+  <xs:import

+      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"

+      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" />

+

+  <xs:import

+      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"

+      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" />

+

+  <xs:import

+      namespace="http://www.w3.org/XML/1998/namespace"

+      schemaLocation="http://www.w3.org/2001/xml.xsd" />

+

+    <!-- Constructs from the Web Services Policy 1.5 Framework -->

+

+  <xs:element name="Policy" >

+    <xs:complexType>

+

+      <xs:complexContent>

+        <xs:extension base="tns:OperatorContentType" >

+          <xs:attribute name="Name" type="xs:anyURI" />

+          <xs:anyAttribute namespace="##any" processContents="lax" />

+        </xs:extension>

+      </xs:complexContent>

+    </xs:complexType>

+  </xs:element>

+

+  <xs:element name="All" type="tns:OperatorContentType" />

+  <xs:element name="ExactlyOne" type="tns:OperatorContentType" />

+

+  <xs:complexType name="OperatorContentType" >

+    <xs:sequence>

+      <xs:choice minOccurs="0" maxOccurs="unbounded" >

+        <xs:element ref="tns:Policy" />

+        <xs:element ref="tns:All" />

+        <xs:element ref="tns:ExactlyOne" />

+

+        <xs:element ref="tns:PolicyReference" />

+        <xs:any namespace="##other" processContents="lax" />

+      </xs:choice>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:element name="PolicyReference" >

+    <xs:complexType>

+      <xs:sequence>

+        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+      </xs:sequence>

+      <xs:attribute name="URI" type="xs:anyURI" use="required" />

+

+      <xs:attribute name="Digest" type="xs:base64Binary" />

+      <xs:attribute name="DigestAlgorithm"

+                    type="xs:anyURI"

+                    default="http://www.w3.org/ns/ws-policy/Sha1Exc"

+                    />

+      <xs:anyAttribute namespace="##any" processContents="lax" />

+    </xs:complexType>

+  </xs:element>

+

+  <xs:attribute name="Optional" type="xs:boolean" default="false" />

+  <xs:attribute name="Ignorable" type="xs:boolean" default="false" />

+

+    <!-- Constructs from the Web Services Policy 1.5 Attachment -->

+

+  <xs:attribute name="PolicyURIs" >

+    <xs:simpleType>

+      <xs:list itemType="xs:anyURI" />

+    </xs:simpleType>

+  </xs:attribute>

+

+  <xs:element name="PolicyAttachment" >

+    <xs:complexType>

+      <xs:sequence>

+

+        <xs:element ref="tns:AppliesTo" />

+        <xs:choice maxOccurs="unbounded" >

+          <xs:element ref="tns:Policy" />

+          <xs:element ref="tns:PolicyReference" />

+        </xs:choice>

+        <!-- omitted only because it causes the content model to be non-determistic

+        <xs:element ref="wsse:Security" minOccurs="0" />

+-->

+        <xs:any namespace="##other"

+        processContents="lax"

+        minOccurs="0"

+        maxOccurs="unbounded" />

+      </xs:sequence>

+      <xs:anyAttribute namespace="##any" processContents="lax" />

+

+    </xs:complexType>

+  </xs:element>

+

+  <xs:element name="AppliesTo" >

+    <xs:complexType>

+      <xs:sequence>

+        <xs:any namespace="##any"

+        processContents="lax"

+        maxOccurs="unbounded" />

+      </xs:sequence>

+      <xs:anyAttribute namespace="##any" processContents="lax" />

+

+    </xs:complexType>

+  </xs:element>

+

+  <xs:element name="URI">

+    <xs:complexType>

+      <xs:simpleContent>

+        <xs:extension base="xs:anyURI">

+          <xs:anyAttribute namespace="##any" processContents="lax" />

+        </xs:extension>

+      </xs:simpleContent>

+    </xs:complexType>

+  </xs:element>

+

+</xs:schema>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 79af5e9363..24e0b5a975 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
-<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ -->
-<!-- 
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!--
    W3C XML Schema defined in the Web Services Description (WSDL)
     Version 2.0 specification
      http://www.w3.org/TR/wsdl20
 
-   Copyright (c) 2004 World Wide Web Consortium,
-  
+   Copyright © 2007 World Wide Web Consortium,
+
    (Massachusetts Institute of Technology, European Research Consortium for
    Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C(r) Software License [1] in the hope that
+   work is distributed under the W3C® Software License [1] in the hope that
    it will be useful, but WITHOUT ANY WARRANTY; without even the implied
    warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  
+
    [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+   $Id: wsdl20-instance.xsd,v 1.1 2007/06/19 15:59:38 plehegar Exp $
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/ns/wsdl-instance" targetNamespace="http://www.w3.org/ns/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
 
   <xs:attribute name="wsdlLocation">
     <xs:annotation>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
new file mode 100644
index 0000000000..267b0d33b4
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
@@ -0,0 +1,117 @@
+<?xml version='1.0'?>

+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >

+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">

+

+ <xs:annotation>

+  <xs:documentation>

+   See http://www.w3.org/XML/1998/namespace.html and

+   http://www.w3.org/TR/REC-xml for information about this namespace.

+

+    This schema document describes the XML namespace, in a form

+    suitable for import by other schema documents.

+

+    Note that local names in this namespace are intended to be defined

+    only by the World Wide Web Consortium or its subgroups.  The

+    following names are currently defined in this namespace and should

+    not be used with conflicting semantics by any Working Group,

+    specification, or document instance:

+

+    base (as an attribute name): denotes an attribute whose value

+         provides a URI to be used as the base for interpreting any

+         relative URIs in the scope of the element on which it

+         appears; its value is inherited.  This name is reserved

+         by virtue of its definition in the XML Base specification.

+

+    lang (as an attribute name): denotes an attribute whose value

+         is a language code for the natural language of the content of

+         any element; its value is inherited.  This name is reserved

+         by virtue of its definition in the XML specification.

+

+    space (as an attribute name): denotes an attribute whose

+         value is a keyword indicating what whitespace processing

+         discipline is intended for the content of the element; its

+         value is inherited.  This name is reserved by virtue of its

+         definition in the XML specification.

+

+    Father (in any context at all): denotes Jon Bosak, the chair of

+         the original XML Working Group.  This name is reserved by

+         the following decision of the W3C XML Plenary and

+         XML Coordination groups:

+

+             In appreciation for his vision, leadership and dedication

+             the W3C XML Plenary on this 10th day of February, 2000

+             reserves for Jon Bosak in perpetuity the XML name

+             xml:Father

+  </xs:documentation>

+ </xs:annotation>

+

+ <xs:annotation>

+  <xs:documentation>This schema defines attributes and an attribute group

+        suitable for use by

+        schemas wishing to allow xml:base, xml:lang or xml:space attributes

+        on elements they define.

+

+        To enable this, such a schema must import this schema

+        for the XML namespace, e.g. as follows:

+        &lt;schema . . .>

+         . . .

+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"

+                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>

+

+        Subsequently, qualified reference to any of the attributes

+        or the group defined below will have the desired effect, e.g.

+

+        &lt;type . . .>

+         . . .

+         &lt;attributeGroup ref="xml:specialAttrs"/>

+

+         will define a type which will schema-validate an instance

+         element with any of those attributes</xs:documentation>

+ </xs:annotation>

+

+ <xs:annotation>

+  <xs:documentation>In keeping with the XML Schema WG's standard versioning

+   policy, this schema document will persist at

+   http://www.w3.org/2001/03/xml.xsd.

+   At the date of issue it can also be found at

+   http://www.w3.org/2001/xml.xsd.

+   The schema document at that URI may however change in the future,

+   in order to remain compatible with the latest version of XML Schema

+   itself.  In other words, if the XML Schema namespace changes, the version

+   of this document at

+   http://www.w3.org/2001/xml.xsd will change

+   accordingly; the version at

+   http://www.w3.org/2001/03/xml.xsd will not change.

+  </xs:documentation>

+ </xs:annotation>

+

+ <xs:attribute name="lang" type="xs:language">

+  <xs:annotation>

+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter

+         codes as the enumerated possible values . . .</xs:documentation>

+  </xs:annotation>

+ </xs:attribute>

+

+ <xs:attribute name="space" default="preserve">

+  <xs:simpleType>

+   <xs:restriction base="xs:NCName">

+    <xs:enumeration value="default"/>

+    <xs:enumeration value="preserve"/>

+   </xs:restriction>

+  </xs:simpleType>

+ </xs:attribute>

+

+ <xs:attribute name="base" type="xs:anyURI">

+  <xs:annotation>

+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for

+                     information about this attribute.</xs:documentation>

+  </xs:annotation>

+ </xs:attribute>

+

+ <xs:attributeGroup name="specialAttrs">

+  <xs:attribute ref="xml:base"/>

+  <xs:attribute ref="xml:lang"/>

+  <xs:attribute ref="xml:space"/>

+ </xs:attributeGroup>

+

+</xs:schema>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
new file mode 100644
index 0000000000..df126b30e6
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema 
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified"> 
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence> 
+    <element ref="ds:SignedInfo"/> 
+    <element ref="ds:SignatureValue"/> 
+    <element ref="ds:KeyInfo" minOccurs="0"/> 
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/> 
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence> 
+    <element ref="ds:CanonicalizationMethod"/> 
+    <element ref="ds:SignatureMethod"/> 
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence> 
+    <element ref="ds:Transforms" minOccurs="0"/> 
+    <element ref="ds:DigestMethod"/> 
+    <element ref="ds:DigestValue"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="URI" type="anyURI" use="optional"/> 
+  <attribute name="Type" type="anyURI" use="optional"/> 
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>  
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded"> 
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/> 
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true"> 
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>    
+  <attribute name="Algorithm" type="anyURI" use="required"/> 
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/> 
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">     
+    <element ref="ds:KeyName"/> 
+    <element ref="ds:KeyValue"/> 
+    <element ref="ds:RetrievalMethod"/> 
+    <element ref="ds:X509Data"/> 
+    <element ref="ds:PGPData"/> 
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/> 
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/> 
+    </sequence>  
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/> 
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType"> 
+  <sequence> 
+    <element name="X509IssuerName" type="string"/> 
+    <element name="X509SerialNumber" type="integer"/> 
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/> 
+<complexType name="PGPDataType"> 
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/> 
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/> 
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/> 
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType> 
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/> 
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/> 
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/> 
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/> 
+     <attribute name="Id" type="ID" use="optional"/> 
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/> 
+    <element name="Exponent" type="ds:CryptoBinary"/> 
+  </sequence>
+</complexType> 
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
index 17ce185d14..bae52390fa 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

-     OASIS trademark, IPR and other policies apply.  -->

-<schema xmlns="http://www.w3.org/2001/XMLSchema" 

-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-    xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"

-    xmlns:wsa="http://www.w3.org/2005/08/addressing"

-    elementFormDefault="qualified">

-

-    <import namespace="http://www.w3.org/ns/wsdl-instance"

-            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>

-    <import namespace="http://www.w3.org/2005/08/addressing"

-            schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>

-

-    <include schemaLocation="sca-core-1.1-cd03.xsd"/>

-

-    <element name="binding.ws" type="sca:WebServiceBinding"

-             substitutionGroup="sca:binding"/>

-

-    <complexType name="WebServiceBinding">

-        <complexContent>

-            <extension base="sca:Binding">

-                <sequence>

-                    <element name="endpointReference" type="wsa:EndpointReferenceType"

-                             minOccurs="0" maxOccurs="unbounded"/>

-                    <any namespace="##other" processContents="lax"

-                         minOccurs="0" maxOccurs="unbounded"/>

-                </sequence>

-                <attribute name="wsdlElement" type="anyURI" use="optional"/>

-                <attribute ref="wsdli:wsdlLocation" use="optional"/>

-                <anyAttribute namespace="##any" processContents="lax"/>

-            </extension>

-        </complexContent>

-    </complexType>

-</schema>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
+    xmlns:wsa="http://www.w3.org/2005/08/addressing"
+    elementFormDefault="qualified">
+
+    <import namespace="http://www.w3.org/ns/wsdl-instance"
+            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
+    <import namespace="http://www.w3.org/2005/08/addressing"
+            schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
+
+    <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+
+    <element name="binding.ws" type="sca:WebServiceBinding"
+             substitutionGroup="sca:binding"/>
+
+    <complexType name="WebServiceBinding">
+        <complexContent>
+            <extension base="sca:Binding">
+                <sequence>
+                    <element name="endpointReference" type="wsa:EndpointReferenceType"
+                             minOccurs="0" maxOccurs="unbounded"/>
+                    <any namespace="##other" processContents="lax"
+                         minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="wsdlElement" type="anyURI" use="optional"/>
+                <attribute ref="wsdli:wsdlLocation" use="optional"/>
+                <anyAttribute namespace="##any" processContents="lax"/>
+            </extension>
+        </complexContent>
+    </complexType>
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index e90d9a0fa5..65d85066ae 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
@@ -1,43 +1,53 @@
-<?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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-
-    <element name="implementation.node" type="t:NodeImplementation"/>
-    	
-    <complexType name="NodeImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="uri" type="string" use="required"/>
-                <attribute name="composite" type="QName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
+<?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.

+-->

+<schema xmlns="http://www.w3.org/2001/XMLSchema"

+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"

+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

+    elementFormDefault="qualified">

+

+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>

+

+    <element name="implementation.osgi" type="t:OSGiImplementation"/>

+

+    <complexType name="OSGiImplementation">

+        <complexContent>

+            <extension base="sca:Implementation">

+                <sequence>

+                    <any namespace="##targetNamespace" processContents="lax"

+                    	minOccurs="0" maxOccurs="unbounded"/>

+                </sequence>

+                <attribute name="bundleSymbolicName" type="string" use="required"/>

+                <attribute name="bundleVersion" type="string" use="optional"/>

+                <anyAttribute namespace="##any" processContents="lax"/>

+            </extension>

+        </complexContent>

+    </complexType>

+   <element name="osgi.property" type="t:OSGiProperty"/>

+   <complexType name="OSGiProperty">

+      <simpleContent>

+        <extension base="string">

+            <attribute name="name" type="NCName" use="required"/>

+            <attribute name="value" type="string" use="optional"/>

+        </extension>

+      </simpleContent>

+   </complexType>

+

+</schema>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index d3a2711ee0..d36fff3ca1 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
@@ -7,27 +7,28 @@
  * 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.    
+ * under the License.
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1">
-    
-    <import namespace="http://www.w3.org/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/>
-    
+
+<!--
+    <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
+-->
     <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-    
+
     <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>
-    
-    <include schemaLocation="tuscany-sca-1.1-implementation-node.xsd"/>
+
+    <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/>
 </schema>
\ No newline at end of file
diff --git a/java/sca/modules/contribution/META-INF/MANIFEST.MF b/java/sca/modules/contribution/META-INF/MANIFEST.MF
index bc4b1fc925..37dc95d9c5 100644
--- a/java/sca/modules/contribution/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution/META-INF/MANIFEST.MF
@@ -37,6 +37,7 @@ Import-Package: javax.xml.namespace,
  javax.xml.validation,

  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.assembly.impl;version="2.0.0",

+ org.apache.tuscany.sca.assembly.xsd;version="2.0.0",

  org.apache.tuscany.sca.contribution;version="2.0.0",

  org.apache.tuscany.sca.contribution.java;version="2.0.0",

  org.apache.tuscany.sca.contribution.namespace;version="2.0.0",

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index 9258a837d8..dd52b8b533 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.contribution.processor;
@@ -27,9 +27,13 @@ import java.net.URLConnection;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.EventFilter;
 import javax.xml.stream.StreamFilter;
 import javax.xml.stream.XMLEventReader;
@@ -51,8 +55,11 @@ import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 /**
  * Default implementation of an XMLInputFactory that creates validating
@@ -60,9 +67,11 @@ import org.xml.sax.SAXParseException;
  *
  * @version $Rev$ $Date$
  */
-public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory {
-    
+public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory implements LSResourceResolver {
+
     private XMLInputFactory inputFactory;
+    private DocumentBuilderFactory documentBuilderFactory;
+    private DOMImplementationLS ls;
     private ValidationSchemaExtensionPoint schemas;
     private Monitor monitor;
     private boolean initialized;
@@ -71,16 +80,16 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory
 
     public DefaultValidatingXMLInputFactory(ExtensionPointRegistry registry) {
         FactoryExtensionPoint factoryExtensionPoint = registry.getExtensionPoint(FactoryExtensionPoint.class);
-        XMLInputFactory factory = factoryExtensionPoint.getFactory(XMLInputFactory.class);
-        this.inputFactory = factory;
+        this.inputFactory = factoryExtensionPoint.getFactory(XMLInputFactory.class);
+        this.documentBuilderFactory = factoryExtensionPoint.getFactory(DocumentBuilderFactory.class);
         this.schemas = registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
         this.monitor =
             registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(MonitorFactory.class).createMonitor();
     }
-    
+
     /**
      * Constructs a new XMLInputFactory.
-     * 
+     *
      * @param inputFactory
      * @param schemas
      */
@@ -89,21 +98,40 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory
         this.schemas = schemas;
         this.monitor = monitor;
     }
-    
+
     /**
      * Report a exception.
-     * 
+     *
      * @param problems
      * @param message
      * @param model
      */
-     private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-    		 Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-    
+    private void error(String message, Object model, Throwable ex) {
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "contribution-validation-messages",
+                                      Severity.ERROR,
+                                      model,
+                                      message,
+                                      ex);
+            monitor.problem(problem);
+        }
+    }
+
+    private void warn(String message, Object model, Throwable ex) {
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "contribution-validation-messages",
+                                      Severity.WARNING,
+                                      model,
+                                      message,
+                                      ex);
+            monitor.problem(problem);
+        }
+    }
+
     /**
      * Initialize the registered schemas and create an aggregated schema for
      * validation.
@@ -113,7 +141,7 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory
             return;
         }
         initialized = true;
-        
+
         // Load the XSDs registered in the validation schema extension point
         try {
             List<String> uris = schemas.getSchemas();
@@ -143,9 +171,31 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory
                 }
                 sources[i] = new StreamSource(urlStream, uri);
             }
-            
+
             // Create an aggregated validation schemas from all the XSDs
             final SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+
+            /*
+            // Set the feature to avoid DTD processing
+            try {
+                schemaFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
+                schemaFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+                schemaFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+            } catch (SAXException e) {
+                // Ignore
+            }
+            */
+
+            DOMImplementation impl = null;
+            try {
+                impl = documentBuilderFactory.newDocumentBuilder().getDOMImplementation();
+            } catch (ParserConfigurationException e) {
+                // Ignore
+            }
+            if (impl instanceof DOMImplementationLS) {
+                ls = (DOMImplementationLS)impl;
+                schemaFactory.setResourceResolver(this);
+            }
             // Allow privileged access to check files. Requires FilePermission
             // in security policy.
             try {
@@ -155,20 +205,19 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory
                     }
                 });
             } catch (PrivilegedActionException e) {
-            	error("PrivilegedActionException", schemaFactory, (SAXException)e.getException());
+            	warn("PrivilegedActionException", schemaFactory, (SAXException)e.getException());
+            	hasSchemas = false;
                 throw (SAXException)e.getException();
             }
 
-        } catch (Error e) {
-            // FIXME Log this, some old JDKs don't support XMLSchema validation
-            //e.printStackTrace();
-        } catch (SAXParseException e) {
-        	IllegalStateException ie = new IllegalStateException(e);
-        	error("IllegalStateException", schemas, ie);
-            throw ie;
-        } catch (Exception e) {
+        } catch (SAXException e) {
+//            IllegalStateException ie = new IllegalStateException(e);
+//            error("IllegalStateException", schemas, ie);
+//            throw ie;
+        } catch (Throwable e) {
             //FIXME Log this, some old JDKs don't support XMLSchema validation
-            e.printStackTrace();
+            warn(e.getMessage(), schemas, e);
+            hasSchemas = false;
         }
     }
 
@@ -322,4 +371,38 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory
         inputFactory.setXMLResolver(arg0);
     }
 
+    private static Map<String, URL> cachedXSDs = new HashMap<String, URL>();
+    static {
+        cachedXSDs
+            .put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd",
+                 DefaultValidatingXMLInputFactory.class
+                     .getResource("/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd"));
+        cachedXSDs
+            .put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd",
+                 DefaultValidatingXMLInputFactory.class
+                     .getResource("/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd"));
+        cachedXSDs.put("http://www.w3.org/2005/08/addressing", DefaultValidatingXMLInputFactory.class
+            .getResource("/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd"));
+        cachedXSDs.put("http://www.w3.org/ns/ws-policy", DefaultValidatingXMLInputFactory.class
+            .getResource("/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd"));
+        cachedXSDs.put("http://www.w3.org/ns/wsdl-instance", DefaultValidatingXMLInputFactory.class
+            .getResource("/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd"));
+        cachedXSDs.put("http://www.w3.org/XML/1998/namespace", DefaultValidatingXMLInputFactory.class
+            .getResource("/org/apache/tuscany/sca/assembly/xsd/xml.xsd"));
+        cachedXSDs.put("http://www.w3.org/2000/09/xmldsig#", DefaultValidatingXMLInputFactory.class
+            .getResource("/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd"));
+    };
+
+    public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
+        URL url = cachedXSDs.get(namespaceURI);
+        if (url != null) {
+            systemId = url.toString();
+        }
+        LSInput input = ls.createLSInput();
+        input.setBaseURI(baseURI);
+        input.setPublicId(publicId);
+        input.setSystemId(systemId);
+        return input;
+    }
+
 }
diff --git a/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties b/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties
index 4f9f85048e..63c4746a4d 100644
--- a/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties
@@ -29,6 +29,6 @@ ContributionWriteException = ContributionWriteException occured due to :
 ContributionReadException = ContributionReadException occured due to :
 UnrecognizedElementException = Unrecognized Element : {0}
 IllegalArgumentException = Invalid qname: {0}
-PrivilegedActionException = PrivilegedActionException occured due to : 
+PrivilegedActionException = PrivilegedActionException occured due to : {0}
 AttributeCannotBeProcessed = Attribute {0} cannot be processed. ({1})