You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2006/10/13 22:43:45 UTC
svn commit: r463816 - in /incubator/tuscany/java:
sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/
sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/
sca/services/databinding/databinding-sdo/src/main/resourc...
Author: rfeng
Date: Fri Oct 13 13:43:44 2006
New Revision: 463816
URL: http://svn.apache.org/viewvc?view=rev&rev=463816
Log:
Use scdlResource to include other extensions for axis2
Added:
incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
Removed:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/databinding.axiom.scdl
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/idl.wsdl.scdl
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=463816&r1=463815&r2=463816
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/default.scdl Fri Oct 13 13:43:44 2006
@@ -43,7 +43,7 @@
</component>
<!-- A workaround to handle inter-extension dependencies -->
- <include name="idl.wsdl" scdlLocation="idl.wsdl.scdl"/>
- <include name="databinding.axiom" scdlLocation="databinding.axiom.scdl"/>
+ <include name="idl.wsdl" scdlResource="META-INF/sca/idl.wsdl.scdl"/>
+ <include name="databinding.axiom" scdlResource="META-INF/sca/databinding.axiom.scdl"/>
</composite>
Added: incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl?view=auto&rev=463816
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl Fri Oct 13 13:43:44 2006
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<!-- This is the copy ot be included by other extensions -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.databinding.axiom.include">
+
+ <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
+ <group>org.apache.tuscany.sca.services.databinding</group>
+ <name>databinding-axiom</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </dependency>
+
+ <component name="databinding.axiom">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2OMElement">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2XMLStreamReader">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" />
+ </component>
+
+ <component name="transformer.String2OMElement">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.String2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2String">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2String" />
+ </component>
+
+ <component name="transformer.Object2OMElement">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.Object2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2Object">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2Object" />
+ </component>
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=463816&r1=463815&r2=463816
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl Fri Oct 13 13:43:44 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
*
@@ -13,16 +13,16 @@
* 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.
--->
+-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="org.apache.tuscany.databinding.Axiom">
+ name="org.apache.tuscany.databinding.axiom">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.services.databinding</group>
<name>databinding-axiom</name>
<version>1.0-incubator-M2-SNAPSHOT</version>
</dependency>
-
+
<component name="databinding.axiom">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />
</component>
@@ -30,24 +30,24 @@
<component name="transformer.XMLStreamReader2OMElement">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" />
</component>
-
+
<component name="transformer.OMElement2XMLStreamReader">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" />
</component>
-
+
<component name="transformer.String2OMElement">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.String2OMElement" />
</component>
-
+
<component name="transformer.OMElement2String">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2String" />
- </component>
-
+ </component>
+
<component name="transformer.Object2OMElement">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.Object2OMElement" />
</component>
-
+
<component name="transformer.OMElement2Object">
<system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2Object" />
- </component>
+ </component>
</composite>
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl?view=auto&rev=463816
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl Fri Oct 13 13:43:44 2006
@@ -0,0 +1,68 @@
+<?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.
+-->
+<!--
+ SDO databinding extension
+
+ This is the copy to be included by other extensions
+
+ $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.databinding.sdo.include">
+
+ <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
+ <group>org.apache.tuscany.sca.services.databinding</group>
+ <name>databinding-sdo</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </dependency>
+
+ <!-- import.sdo element loader implementations -->
+ <component name="elementLoader.import.sdo">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/>
+ </component>
+
+ <component name="databinding.sdo">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" />
+ </component>
+
+ <component name="transformer.DataObject2String">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/>
+ </component>
+ <component name="transformer.DataObject2XMLStreamReader">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/>
+ </component>
+ <component name="transformer.XMLDocument2String">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/>
+ </component>
+ <component name="transformer.String2DataObject">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/>
+ </component>
+ <component name="transformer.XMLDocument2XMLStreamReader">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/>
+ </component>
+ <component name="transformer.XMLStreamReader2DataObject">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/>
+ </component>
+ <component name="transformer.XMLStreamReader2XMLDocument">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/>
+ </component>
+
+</composite>
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=463816&r1=463815&r2=463816
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl Fri Oct 13 13:43:44 2006
@@ -18,7 +18,7 @@
* under the License.
-->
<!--
- import.sdo configuration
+ SDO databinding extension
$Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $
-->
Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=463816&r1=463815&r2=463816
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl Fri Oct 13 13:43:44 2006
@@ -18,22 +18,17 @@
* under the License.
-->
<!--
- Default system configuration for the launcher environment.
+ IDL WSDL extension
$Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="org.apache.tuscany.idl.WSDL">
+ name="org.apache.tuscany.idl.wsdl">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
- <group>wsdl4j</group>
- <name>wsdl4j</name>
- <version>1.5.2</version>
- </dependency>
- <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
- <group>org.apache.ws.commons.schema</group>
- <name>XmlSchema</name>
- <version>SNAPSHOT</version>
+ <group>org.apache.tuscany.sca.services.idl</group>
+ <name>wsdl</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</dependency>
<component name="interface.wsdl.Loader">
Added: incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl?view=auto&rev=463816
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl (added)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl Fri Oct 13 13:43:44 2006
@@ -0,0 +1,52 @@
+<?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.
+-->
+<!--
+ IDL WSDL extension
+
+ This is a copy to be included by other extensions
+
+ $Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.idl.wsdl.include">
+
+ <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
+ <group>org.apache.tuscany.sca.services.idl</group>
+ <name>wsdl</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </dependency>
+
+ <component name="interface.wsdl.Loader">
+ <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" />
+ </component>
+
+ <component name="wsdl.Registry">
+ <system:implementation.system class="org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl" initLevel="40" />
+ </component>
+
+ <component name="xmlSchema.registry">
+ <system:implementation.system class="org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl" initLevel="35" />
+ </component>
+
+ <component name="interface.wsdl.Introspector">
+ <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl" initLevel="40" />
+ </component>
+
+</composite>
\ No newline at end of file
Added: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.axiom.scdl?view=auto&rev=463816
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.axiom.scdl (added)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.axiom.scdl Fri Oct 13 13:43:44 2006
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.databinding.Axiom">
+
+ <component name="databinding.axiom">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />
+ </component>
+
+ <!-- Transformers -->
+ <component name="transformer.XMLStreamReader2OMElement">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2XMLStreamReader">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" />
+ </component>
+
+ <component name="transformer.String2OMElement">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.String2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2String">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2String" />
+ </component>
+
+ <component name="transformer.Object2OMElement">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.Object2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2Object">
+ <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2Object" />
+ </component>
+
+</composite>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org