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 2007/03/21 21:21:01 UTC
svn commit: r520990 - in /incubator/tuscany/java/sca:
extensions/axis2/databinding/src/main/resources/META-INF/sca/
services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/
services/databinding/databinding-sdo/src/main/resources/META-INF/...
Author: rfeng
Date: Wed Mar 21 13:21:00 2007
New Revision: 520990
URL: http://svn.apache.org/viewvc?view=rev&rev=520990
Log:
Fix the namespace for <dependency> element
Modified:
incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl
incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.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
incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl
Modified: incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl?view=diff&rev=520990&r1=520989&r2=520990
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl Wed Mar 21 13:21:00 2007
@@ -21,10 +21,10 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha"
name="org.apache.tuscany.databinding.axiom.include" autowire="true">
- <dependency xmlns="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha">
- <group>org.apache.tuscany.sca.extensions.axis2</group>
+ <dependency xmlns="http://tuscany.apache.org/xmlns/sca/2.0-alpha">
+ <group>org.apache.tuscany.sca.axis2</group>
<name>databinding-axiom</name>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
</dependency>
<component name="databinding.axiom">
Modified: incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=520990&r1=520989&r2=520990
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl Wed Mar 21 13:21:00 2007
@@ -17,40 +17,6 @@
* 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/sca/system/2.0-alpha"
- name="org.apache.tuscany.databinding.axiom" autowire="true">
-
- <dependency xmlns="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha">
- <group>org.apache.tuscany.sca.extensions.axis2</group>
- <name>databinding-axiom</name>
- <version>1.0-incubator-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 xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.axiom" autowire="true">
+ <include name="org.apache.tuscany.databinding.axiom.include" scdlLocation="databinding.axiom.scdl" />
</composite>
Modified: incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl?view=diff&rev=520990&r1=520989&r2=520990
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl Wed Mar 21 13:21:00 2007
@@ -20,10 +20,10 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha"
name="org.apache.tuscany.databinding.jaxb.include" autowire="true">
- <dependency xmlns="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha">
+ <dependency xmlns="http://tuscany.apache.org/xmlns/sca/2.0-alpha">
<group>org.apache.tuscany.sca.services.databinding</group>
<name>databinding-jaxb</name>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
</dependency>
<component name="databinding.jaxb">
Modified: incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=520990&r1=520989&r2=520990
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl Wed Mar 21 13:21:00 2007
@@ -1,49 +1,22 @@
<?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.
+ * 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.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha"
- name="org.apache.tuscany.databinding.jaxb" autowire="true">
-
- <dependency xmlns="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha">
- <group>org.apache.tuscany.sca.services.databinding</group>
- <name>databinding-jaxb</name>
- <version>1.0-incubator-SNAPSHOT</version>
- </dependency>
-
- <component name="databinding.jaxb">
- <system:implementation.system class="org.apache.tuscany.databinding.jaxb.JAXBDataBinding" />
- </component>
-
- <component name="transformer.XMLStreamReader2JAXB">
- <system:implementation.system class="org.apache.tuscany.databinding.jaxb.XMLStreamReader2JAXB" />
- </component>
-
- <component name="transformer.Node2JAXB">
- <system:implementation.system class="org.apache.tuscany.databinding.jaxb.Node2JAXB" />
- </component>
-
- <component name="transformer.JAXB2Node">
- <system:implementation.system class="org.apache.tuscany.databinding.jaxb.JAXB2Node" />
- </component>
-
- <component name="transformer.Reader2JAXB">
- <system:implementation.system class="org.apache.tuscany.databinding.jaxb.Reader2JAXB" />
- </component>
-
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.jaxb" autowire="true">
+ <include name="org.apache.tuscany.databinding.jaxb.include" scdlLocation="databinding.jaxb.scdl" />
</composite>
Modified: 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=diff&rev=520990&r1=520989&r2=520990
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl Wed Mar 21 13:21:00 2007
@@ -27,7 +27,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha"
name="org.apache.tuscany.databinding.sdo.include" autowire="true">
- <dependency xmlns="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha">
+ <dependency xmlns="http://tuscany.apache.org/xmlns/sca/2.0-alpha">
<group>org.apache.tuscany.sca.services.databinding</group>
<name>databinding-sdo</name>
<version>2.0-alpha2-incubating-SNAPSHOT</version>
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=520990&r1=520989&r2=520990
==============================================================================
--- 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 Wed Mar 21 13:21:00 2007
@@ -22,9 +22,6 @@
$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/sca/system/2.0-alpha"
- name="org.apache.tuscany.databinding.sdo" autowire="true">
-
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.sdo" autowire="true">
<include name="org.apache.tuscany.databinding.sdo.include" scdlLocation="databinding.sdo.scdl" />
-
</composite>
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=520990&r1=520989&r2=520990
==============================================================================
--- 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 Wed Mar 21 13:21:00 2007
@@ -23,7 +23,5 @@
$Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.idl.wsdl" autowire="true">
-
<include name="org.apache.tuscany.idl.wsdl.include" scdlLocation="idl.wsdl.scdl" />
-
</composite>
Modified: 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=diff&rev=520990&r1=520989&r2=520990
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl Wed Mar 21 13:21:00 2007
@@ -27,7 +27,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha"
name="org.apache.tuscany.idl.wsdl.include" autowire="true">
- <dependency xmlns="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha">
+ <dependency xmlns="http://tuscany.apache.org/xmlns/sca/2.0-alpha">
<group>org.apache.tuscany.sca.services.idl</group>
<name>wsdl</name>
<version>2.0-alpha2-incubating-SNAPSHOT</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org