summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/deployment/src/main
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-05-13 20:26:32 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-05-13 20:26:32 +0000
commit6793cfe485255d5bfe5881aa2e7698de335b6bd0 (patch)
treeb430a6b27217944611ca4a2c7c4d07271f8057ce /sca-java-2.x/trunk/modules/deployment/src/main
parente8051a35a46e4686e1d5553e9f8383dc6472b18c (diff)
Allow direct access to the SCA schema. Rather than via the Tuscany schema. At the moment I've turned off validation of sca namespace schema as the OASIS sca schema already includes a "value" element which is an any. So values should validate against anything. Am raising with OASIS but didn't want to do any more fiddling until I get an answer as the guts of this stuff is proving surprisingly frustrating.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@944004 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/deployment/src/main')
-rw-r--r--sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
index b356df0f35..84f8ef63b2 100644
--- a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
+++ b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
@@ -404,10 +404,10 @@ public class DeployerImpl implements Deployer {
scaSchema.setLocation(scaSchemaURL.toURI());
scaSchema.setUnresolved(false);
// modelResolver.addModel(scaSchema, context);
-
+ } else if (namespace.equals(Constants.SCA11_NS)) {
// we know that the SCA schema's are referenced form the Tuscany schemas so
- // register the schema under the SCA namsepace too
- scaSchema = xsdFactory.createXSDefinition();
+ // register the schema under the SCA namespace too
+ XSDefinition scaSchema = xsdFactory.createXSDefinition();
scaSchema.setUnresolved(true);
scaSchema.setNamespace(Constants.SCA11_NS);
scaSchema.setLocation(scaSchemaURL.toURI());