You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/06/04 08:27:12 UTC
svn commit: r663002 - in
/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources:
tuscany-sca-data-helper.xsd tuscany-sca-implementation-das.xsd
tuscany-sca-implementation-data-xml.xsd tuscany-sca.xsd
Author: lresende
Date: Tue Jun 3 23:27:11 2008
New Revision: 663002
URL: http://svn.apache.org/viewvc?rev=663002&view=rev
Log:
Schema for implementation.das and implementation.data
Added:
incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd (with props)
incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd (with props)
incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd (with props)
Modified:
incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
Added: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd?rev=663002&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd (added)
+++ incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd Tue Jun 3 23:27:11 2008
@@ -0,0 +1,44 @@
+<?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://data.tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
+ elementFormDefault="qualified">
+
+ <complexType name="ConnectionProperties">
+ <attribute name="driverClass" type="string" />
+ <attribute name="databaseURL" type="string" />
+ <attribute name="userName" type="string" default="" />
+ <attribute name="password" type="string" default="" />
+ <attribute name="loginTimeout" type="int" default="0" />
+ </complexType>
+
+ <complexType name="ConnectionInfo">
+ <sequence>
+ <element maxOccurs="1" minOccurs="0"
+ name="ConnectionProperties" type="data:ConnectionProperties" />
+ </sequence>
+ <attribute name="dataSource" type="string" />
+ <attribute name="managedtx" type="boolean"
+ default="true" />
+ </complexType>
+</schema>
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd?rev=663002&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd (added)
+++ incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd Tue Jun 3 23:27:11 2008
@@ -0,0 +1,46 @@
+<?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.0"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
+ elementFormDefault="qualified">
+
+ <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+ <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.xsd"/>
+
+ <element name="implementation.das" type="t:DASImplementation"/>
+
+ <complexType name="DASImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <any namespace="##targetNamespace" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <element maxOccurs="1" minOccurs="0" name="ConnectionInfo"
+ type="data:ConnectionInfo"/>
+ </sequence>
+ <attribute name="config" type="NCName" use="required"/>
+ <attribute name="dataAccessType" type="NCName" use="required"/>
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd?rev=663002&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd (added)
+++ incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd Tue Jun 3 23:27:11 2008
@@ -0,0 +1,45 @@
+<?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.0"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
+ elementFormDefault="qualified">
+
+ <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+ <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.xsd"/>
+
+ <element name="implementation.data" type="t:DATAImplementation"/>
+
+ <complexType name="DATAImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <any namespace="##targetNamespace" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <element maxOccurs="1" minOccurs="0" name="ConnectionInfo"
+ type="data:ConnectionInfo"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd?rev=663002&r1=663001&r2=663002&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd (original)
+++ incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd Tue Jun 3 23:27:11 2008
@@ -21,7 +21,8 @@
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
<import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/>
-
+ <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.xsd"/>
+
<include schemaLocation="tuscany-sca-binding-atom.xsd"/>
<include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
<include schemaLocation="tuscany-sca-binding-http.xsd"/>
@@ -30,10 +31,8 @@
<include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
<include schemaLocation="tuscany-sca-binding-rss.xsd"/>
- <!--
<include schemaLocation="tuscany-sca-implementation-das.xsd"/>
- <include schemaLocation="tuscany-sca-implementation-data.xsd"/>
- -->
+ <include schemaLocation="tuscany-sca-implementation-data-xml.xsd"/>
<include schemaLocation="tuscany-sca-implementation-node.xsd"/>
<include schemaLocation="tuscany-sca-implementation-notification.xsd"/>
<include schemaLocation="tuscany-sca-implementation-osgi.xsd"/>
Re: svn commit: r663002 - in /incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources: tuscany-sca-data-helper.xsd tuscany-sca-implementation-das.xsd tuscany-sca-implementation-data-xml.xsd tuscany-sca.xsd
Posted by Luciano Resende <lu...@gmail.com>.
Sorry for the inconvenience, I have removed the offending XSD for now,
and it looks like this resolved the issue mentioned below.
On Wed, Jun 4, 2008 at 1:19 AM, ant elder <an...@gmail.com> wrote:
> I'm getting a build failure in modules/assembly-xml after this with the
> error below, does anyone else see that? Commenting out the includes for
> implementation-das and data-xml gets it going again.
>
> testReadBinding(org.apache.tuscany.sca.assembly.xml.ReadDocumentTestCase)
> Time elapsed: 0.032 sec <<< ERROR!
> java.lang.IllegalStateException: org.xml.sax.SAXParseException:
> cos-nonambig: WC["http://tuscany.apache.org/xmlns/sca/1.
> 0"] and "http://tuscany.apache.org/xmlns/sca/1.0":ConnectionInfo (or
> elements from their substitution group) violate "Un
> ique Particle Attribution". During validation against this schema, ambiguity
> would be created for those two particles.
> at
> org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory.initializeSchemas(DefaultValid
> atingXMLInputFactory.java:135)
>
> ...ant
>
> On Wed, Jun 4, 2008 at 7:27 AM, <lr...@apache.org> wrote:
>
>> Author: lresende
>> Date: Tue Jun 3 23:27:11 2008
>> New Revision: 663002
>>
>> URL: http://svn.apache.org/viewvc?rev=663002&view=rev
>> Log:
>> Schema for implementation.das and implementation.data
>>
>> Added:
>>
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>> (with props)
>>
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>> (with props)
>>
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>> (with props)
>> Modified:
>>
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
>>
>> Added:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>> URL:
>> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd?rev=663002&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>> (added)
>> +++
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>> Tue Jun 3 23:27:11 2008
>> @@ -0,0 +1,44 @@
>> +<?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://data.tuscany.apache.org/xmlns/sca/1.0"
>> + xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
>> + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
>> + xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
>> + elementFormDefault="qualified">
>> +
>> + <complexType name="ConnectionProperties">
>> + <attribute name="driverClass" type="string" />
>> + <attribute name="databaseURL" type="string" />
>> + <attribute name="userName" type="string" default="" />
>> + <attribute name="password" type="string" default="" />
>> + <attribute name="loginTimeout" type="int" default="0" />
>> + </complexType>
>> +
>> + <complexType name="ConnectionInfo">
>> + <sequence>
>> + <element maxOccurs="1" minOccurs="0"
>> + name="ConnectionProperties"
>> type="data:ConnectionProperties" />
>> + </sequence>
>> + <attribute name="dataSource" type="string" />
>> + <attribute name="managedtx" type="boolean"
>> + default="true" />
>> + </complexType>
>> +</schema>
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Rev Date
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/xml
>>
>> Added:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>> URL:
>> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd?rev=663002&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>> (added)
>> +++
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>> Tue Jun 3 23:27:11 2008
>> @@ -0,0 +1,46 @@
>> +<?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.0"
>> + xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
>> + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
>> + xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
>> + elementFormDefault="qualified">
>> +
>> + <import namespace="http://www.osoa.org/xmlns/sca/1.0"
>> schemaLocation="sca-core.xsd"/>
>> + <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0"
>> schemaLocation="tuscany-sca-data-helper.xsd"/>
>> +
>> + <element name="implementation.das" type="t:DASImplementation"/>
>> +
>> + <complexType name="DASImplementation">
>> + <complexContent>
>> + <extension base="sca:Implementation">
>> + <sequence>
>> + <any namespace="##targetNamespace"
>> processContents="lax"
>> + minOccurs="0" maxOccurs="unbounded"/>
>> + <element maxOccurs="1" minOccurs="0"
>> name="ConnectionInfo"
>> + type="data:ConnectionInfo"/>
>> + </sequence>
>> + <attribute name="config" type="NCName" use="required"/>
>> + <attribute name="dataAccessType" type="NCName"
>> use="required"/>
>> + </extension>
>> + </complexContent>
>> + </complexType>
>> +</schema>
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Rev Date
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/xml
>>
>> Added:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>> URL:
>> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd?rev=663002&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>> (added)
>> +++
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>> Tue Jun 3 23:27:11 2008
>> @@ -0,0 +1,45 @@
>> +<?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.0"
>> + xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
>> + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
>> + xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
>> + elementFormDefault="qualified">
>> +
>> + <import namespace="http://www.osoa.org/xmlns/sca/1.0"
>> schemaLocation="sca-core.xsd"/>
>> + <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0"
>> schemaLocation="tuscany-sca-data-helper.xsd"/>
>> +
>> + <element name="implementation.data" type="t:DATAImplementation"/>
>> +
>> + <complexType name="DATAImplementation">
>> + <complexContent>
>> + <extension base="sca:Implementation">
>> + <sequence>
>> + <any namespace="##targetNamespace"
>> processContents="lax"
>> + minOccurs="0" maxOccurs="unbounded"/>
>> + <element maxOccurs="1" minOccurs="0"
>> name="ConnectionInfo"
>> + type="data:ConnectionInfo"/>
>> + </sequence>
>> + </extension>
>> + </complexContent>
>> + </complexType>
>> +
>> +</schema>
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Rev Date
>>
>> Propchange:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/xml
>>
>> Modified:
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
>> URL:
>> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd?rev=663002&r1=663001&r2=663002&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
>> (original)
>> +++
>> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
>> Tue Jun 3 23:27:11 2008
>> @@ -21,7 +21,8 @@
>> targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
>>
>> <import namespace="http://www.osoa.org/xmlns/sca/1.0"
>> schemaLocation="sca-all.xsd"/>
>> -
>> + <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0"
>> schemaLocation="tuscany-sca-data-helper.xsd"/>
>> +
>> <include schemaLocation="tuscany-sca-binding-atom.xsd"/>
>> <include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
>> <include schemaLocation="tuscany-sca-binding-http.xsd"/>
>> @@ -30,10 +31,8 @@
>> <include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
>> <include schemaLocation="tuscany-sca-binding-rss.xsd"/>
>>
>> - <!--
>> <include schemaLocation="tuscany-sca-implementation-das.xsd"/>
>> - <include schemaLocation="tuscany-sca-implementation-data.xsd"/>
>> - -->
>> + <include schemaLocation="tuscany-sca-implementation-data-xml.xsd"/>
>> <include schemaLocation="tuscany-sca-implementation-node.xsd"/>
>> <include schemaLocation="tuscany-sca-implementation-notification.xsd"/>
>> <include schemaLocation="tuscany-sca-implementation-osgi.xsd"/>
>>
>>
>>
>
--
Luciano Resende
Apache Tuscany Committer
http://people.apache.org/~lresende
http://lresende.blogspot.com/
Re: svn commit: r663002 - in /incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources: tuscany-sca-data-helper.xsd tuscany-sca-implementation-das.xsd tuscany-sca-implementation-data-xml.xsd tuscany-sca.xsd
Posted by ant elder <an...@gmail.com>.
I'm getting a build failure in modules/assembly-xml after this with the
error below, does anyone else see that? Commenting out the includes for
implementation-das and data-xml gets it going again.
testReadBinding(org.apache.tuscany.sca.assembly.xml.ReadDocumentTestCase)
Time elapsed: 0.032 sec <<< ERROR!
java.lang.IllegalStateException: org.xml.sax.SAXParseException:
cos-nonambig: WC["http://tuscany.apache.org/xmlns/sca/1.
0"] and "http://tuscany.apache.org/xmlns/sca/1.0":ConnectionInfo (or
elements from their substitution group) violate "Un
ique Particle Attribution". During validation against this schema, ambiguity
would be created for those two particles.
at
org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory.initializeSchemas(DefaultValid
atingXMLInputFactory.java:135)
...ant
On Wed, Jun 4, 2008 at 7:27 AM, <lr...@apache.org> wrote:
> Author: lresende
> Date: Tue Jun 3 23:27:11 2008
> New Revision: 663002
>
> URL: http://svn.apache.org/viewvc?rev=663002&view=rev
> Log:
> Schema for implementation.das and implementation.data
>
> Added:
>
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
> (with props)
>
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
> (with props)
>
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
> (with props)
> Modified:
>
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
>
> Added:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd?rev=663002&view=auto
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
> (added)
> +++
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
> Tue Jun 3 23:27:11 2008
> @@ -0,0 +1,44 @@
> +<?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://data.tuscany.apache.org/xmlns/sca/1.0"
> + xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
> + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
> + xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
> + elementFormDefault="qualified">
> +
> + <complexType name="ConnectionProperties">
> + <attribute name="driverClass" type="string" />
> + <attribute name="databaseURL" type="string" />
> + <attribute name="userName" type="string" default="" />
> + <attribute name="password" type="string" default="" />
> + <attribute name="loginTimeout" type="int" default="0" />
> + </complexType>
> +
> + <complexType name="ConnectionInfo">
> + <sequence>
> + <element maxOccurs="1" minOccurs="0"
> + name="ConnectionProperties"
> type="data:ConnectionProperties" />
> + </sequence>
> + <attribute name="dataSource" type="string" />
> + <attribute name="managedtx" type="boolean"
> + default="true" />
> + </complexType>
> +</schema>
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>
> ------------------------------------------------------------------------------
> svn:keywords = Rev Date
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/xml
>
> Added:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd?rev=663002&view=auto
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
> (added)
> +++
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
> Tue Jun 3 23:27:11 2008
> @@ -0,0 +1,46 @@
> +<?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.0"
> + xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
> + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
> + xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
> + elementFormDefault="qualified">
> +
> + <import namespace="http://www.osoa.org/xmlns/sca/1.0"
> schemaLocation="sca-core.xsd"/>
> + <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0"
> schemaLocation="tuscany-sca-data-helper.xsd"/>
> +
> + <element name="implementation.das" type="t:DASImplementation"/>
> +
> + <complexType name="DASImplementation">
> + <complexContent>
> + <extension base="sca:Implementation">
> + <sequence>
> + <any namespace="##targetNamespace"
> processContents="lax"
> + minOccurs="0" maxOccurs="unbounded"/>
> + <element maxOccurs="1" minOccurs="0"
> name="ConnectionInfo"
> + type="data:ConnectionInfo"/>
> + </sequence>
> + <attribute name="config" type="NCName" use="required"/>
> + <attribute name="dataAccessType" type="NCName"
> use="required"/>
> + </extension>
> + </complexContent>
> + </complexType>
> +</schema>
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>
> ------------------------------------------------------------------------------
> svn:keywords = Rev Date
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/xml
>
> Added:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd?rev=663002&view=auto
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
> (added)
> +++
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
> Tue Jun 3 23:27:11 2008
> @@ -0,0 +1,45 @@
> +<?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.0"
> + xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
> + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
> + xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
> + elementFormDefault="qualified">
> +
> + <import namespace="http://www.osoa.org/xmlns/sca/1.0"
> schemaLocation="sca-core.xsd"/>
> + <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0"
> schemaLocation="tuscany-sca-data-helper.xsd"/>
> +
> + <element name="implementation.data" type="t:DATAImplementation"/>
> +
> + <complexType name="DATAImplementation">
> + <complexContent>
> + <extension base="sca:Implementation">
> + <sequence>
> + <any namespace="##targetNamespace"
> processContents="lax"
> + minOccurs="0" maxOccurs="unbounded"/>
> + <element maxOccurs="1" minOccurs="0"
> name="ConnectionInfo"
> + type="data:ConnectionInfo"/>
> + </sequence>
> + </extension>
> + </complexContent>
> + </complexType>
> +
> +</schema>
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>
> ------------------------------------------------------------------------------
> svn:keywords = Rev Date
>
> Propchange:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/xml
>
> Modified:
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd?rev=663002&r1=663001&r2=663002&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
> (original)
> +++
> incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
> Tue Jun 3 23:27:11 2008
> @@ -21,7 +21,8 @@
> targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
>
> <import namespace="http://www.osoa.org/xmlns/sca/1.0"
> schemaLocation="sca-all.xsd"/>
> -
> + <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0"
> schemaLocation="tuscany-sca-data-helper.xsd"/>
> +
> <include schemaLocation="tuscany-sca-binding-atom.xsd"/>
> <include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
> <include schemaLocation="tuscany-sca-binding-http.xsd"/>
> @@ -30,10 +31,8 @@
> <include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
> <include schemaLocation="tuscany-sca-binding-rss.xsd"/>
>
> - <!--
> <include schemaLocation="tuscany-sca-implementation-das.xsd"/>
> - <include schemaLocation="tuscany-sca-implementation-data.xsd"/>
> - -->
> + <include schemaLocation="tuscany-sca-implementation-data-xml.xsd"/>
> <include schemaLocation="tuscany-sca-implementation-node.xsd"/>
> <include schemaLocation="tuscany-sca-implementation-notification.xsd"/>
> <include schemaLocation="tuscany-sca-implementation-osgi.xsd"/>
>
>
>