You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/09/17 08:53:19 UTC
svn commit: r576280 - in /incubator/tuscany/java/sca:
modules/assembly-xsd/src/main/resources/sca-core.xsd
samples/quote-xquery/src/main/resources/xqueryquotews.composite
samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
Author: jsdelfino
Date: Sun Sep 16 23:53:18 2007
New Revision: 576280
URL: http://svn.apache.org/viewvc?rev=576280&view=rev
Log:
Fixed XMLSchema validation errors in XQuery sample. Fixed problem in SCA XSD, the any element namespace=other should be inside the composite/choice instead of the end of the sequence.
Modified:
incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd
incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite
incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
Modified: incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd?rev=576280&r1=576279&r2=576280&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd (original)
+++ incubator/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd Sun Sep 16 23:53:18 2007
@@ -36,9 +36,12 @@
<element name="component" type="sca:Component"/>
<element name="reference" type="sca:Reference"/>
<element name="wire" type="sca:Wire"/>
+ <any namespace="##other" processContents="lax"/>
</choice>
+ <!--
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
+ -->
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="targetNamespace" type="anyURI" use="optional"/>
Modified: incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite?rev=576280&r1=576279&r2=576280&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite (original)
+++ incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite Sun Sep 16 23:53:18 2007
@@ -28,11 +28,11 @@
<dbsdo:import.sdo location="wsdl/quotejoin.wsdl" />
<component name="QuoteJoinServerComponent">
+ <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
<service name="quoteJoin">
<interface.java interface="xquery.quote.QuoteJoin" />
<binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)" />
</service>
- <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
<reference name="quoteCalculator" target="QuoteCalculatorServerComponent" />
</component>
@@ -41,12 +41,12 @@
</component>
<component name="AvailQuoteProviderComponent">
+ <implementation.java class="xquery.quote.AvailQuoteProviderImpl" />
<service name="AvailQuoteProviderService">
<interface.java interface="xquery.quote.AvailQuoteProviderService" />
<binding.ws
wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
</service>
- <implementation.java class="xquery.quote.AvailQuoteProviderImpl" />
</component>
</composite>
Modified: incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite?rev=576280&r1=576279&r2=576280&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite (original)
+++ incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite Sun Sep 16 23:53:18 2007
@@ -32,6 +32,7 @@
<tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
<reference name="quoteCalculator" target="QuoteCalculatorComponent" />
</component>
+
<component name="QuoteJoinPropertiesComponent">
<tuscany:implementation.xquery location="META-INF/sca/quote_join_properties.xq" />
<!-- Reset the default namespace as the sub-elements under pri:priceQuote are
@@ -84,6 +85,7 @@
<property name="taxRate">0.1</property>
<reference name="quoteCalculator" target="QuoteCalculatorComponent" />
</component>
+
<component name="QuoteJoinExternalReferencesComponent">
<tuscany:implementation.xquery location="META-INF/sca/quote_join_external_references.xq" />
<reference name="quoteCalculator" target="QuoteCalculatorComponent" />
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org