You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/10/10 19:22:03 UTC

svn commit: r454836 - in /incubator/tuscany/java/testing/sca/interop/clients: webserviceInteropDoc/src/test/resources/META-INF/tuscany/ webserviceSOAPRound2/src/test/resources/META-INF/tuscany/ webserviceXSQ/ webserviceXSQ/src/test/resources/META-INF/t...

Author: rineholt
Date: Tue Oct 10 10:22:02 2006
New Revision: 454836

URL: http://svn.apache.org/viewvc?view=rev&rev=454836
Log:
make test scdl match

Modified:
    incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/binding.axis2.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/binding.axis2.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml
    incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/binding.axis2.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
    incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/interface.wsdl.scdl

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/binding.axis2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/binding.axis2.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/binding.axis2.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/binding.axis2.scdl Tue Oct 10 10:22:02 2006
@@ -20,14 +20,13 @@
 <!-- Axis2 based WebService binding extension -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"
            name="org.apache.tuscany.binding.axis2.WebServiceBinding">
 
-    <tuscany:dependency>
+    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
         <group>axis2</group>
-        <artifact>axis2-core</artifact>
+        <name>axis2-kernel</name>
         <version>SNAPSHOT</version>
-    </tuscany:dependency>
+    </dependency>
     
     <component name="webservice.bindingLoader">
         <system:implementation.system class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/>

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.axiom.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.axiom.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.axiom.scdl Tue Oct 10 10:22:02 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,7 +13,7 @@
     *  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">
 

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.sdo.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.sdo.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/databinding.sdo.scdl Tue Oct 10 10:22:02 2006
@@ -30,9 +30,11 @@
     <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>

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/interface.wsdl.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/interface.wsdl.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/interface.wsdl.scdl Tue Oct 10 10:22:02 2006
@@ -25,6 +25,17 @@
 <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">
 
+    <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</group>
+        <name>XmlSchema</name>
+        <version>SNAPSHOT</version>
+    </dependency>
+
     <component name="interface.wsdl.Loader">
         <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" />
     </component>

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/binding.axis2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/binding.axis2.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/binding.axis2.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/binding.axis2.scdl Tue Oct 10 10:22:02 2006
@@ -20,14 +20,13 @@
 <!-- Axis2 based WebService binding extension -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"
            name="org.apache.tuscany.binding.axis2.WebServiceBinding">
 
-    <tuscany:dependency>
+    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
         <group>axis2</group>
-        <artifact>axis2-core</artifact>
+        <name>axis2-kernel</name>
         <version>SNAPSHOT</version>
-    </tuscany:dependency>
+    </dependency>
     
     <component name="webservice.bindingLoader">
         <system:implementation.system class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/>

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/databinding.sdo.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/databinding.sdo.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/resources/META-INF/tuscany/databinding.sdo.scdl Tue Oct 10 10:22:02 2006
@@ -31,4 +31,30 @@
         <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/testing/sca/interop/clients/webserviceXSQ/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml Tue Oct 10 10:22:02 2006
@@ -30,6 +30,22 @@
         <properties>
                 <ws.type>axis2</ws.type>
         </properties>
+
+        <build>
+ <plugins>
+   <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-surefire-plugin</artifactId>
+      <configuration>
+        <forkMode>always</forkMode>
+         <argLine>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=3720,server=y,suspend=y</argLine>
+      </configuration>
+    </plugin>        
+  </plugins>
+  </build>
+
+
+
         <dependencies>
                 <dependency>
                         <groupId>org.apache.tuscany.sca.services.idl</groupId>
@@ -38,4 +54,7 @@
                         <scope>provided</scope>
                 </dependency>
         </dependencies>
+
+
+
 </project>

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/binding.axis2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/binding.axis2.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/binding.axis2.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/binding.axis2.scdl Tue Oct 10 10:22:02 2006
@@ -20,18 +20,13 @@
 <!-- Axis2 based WebService binding extension -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"
            name="org.apache.tuscany.binding.axis2.WebServiceBinding">
 
-    <tuscany:dependency>
+    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
         <group>axis2</group>
-        <artifact>axis2-core</artifact>
+        <name>axis2-kernel</name>
         <version>SNAPSHOT</version>
-    </tuscany:dependency>
- 
- <!--   
-    <include name="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" scdlLocation="interface.wsdl.scdl"/>
-  -->
+    </dependency>
     
     <component name="webservice.bindingLoader">
         <system:implementation.system class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/>

Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.sdo.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.sdo.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/databinding.sdo.scdl Tue Oct 10 10:22:02 2006
@@ -31,4 +31,30 @@
         <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/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/interface.wsdl.scdl?view=diff&rev=454836&r1=454835&r2=454836
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/interface.wsdl.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/tuscany/interface.wsdl.scdl Tue Oct 10 10:22:02 2006
@@ -1,28 +1,41 @@
 <?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/system/1.0-SNAPSHOT"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"
-           name="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader">
+<!--
+    Default system configuration for the launcher environment.
     
+    $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">
+
+    <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</group>
+        <name>XmlSchema</name>
+        <version>SNAPSHOT</version>
+    </dependency>
+
     <component name="interface.wsdl.Loader">
         <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" />
     </component>
@@ -38,5 +51,5 @@
     <component name="interface.wsdl.Introspector">
         <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl" initLevel="40" />
     </component>
-
+    
 </composite>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org