Author: rfeng
Date: Fri Oct 13 15:41:20 2006
New Revision: 463860
URL: http://svn.apache.org/viewvc?view=rev&rev=463860
Log:
Simplify extension references by using scdlResource
Added:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-extensions.scdl
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/binding.axis2.scdl
Removed:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-databinding-axiom.scdl
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-interface-wsdl.scdl
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/binding.axis2.scdl
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/binding.axis2.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/binding.axis2.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
Modified:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-extensions.scdl
Modified:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java?view=diff&rev=463860&r1=463859&r2=463860
==============================================================================
---
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
(original)
+++
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
Fri Oct 13 15:41:20 2006
@@ -38,8 +38,7 @@
protected void setUp() throws Exception {
setApplicationSCDL(getClass(), "META-INF/sca/default.scdl");
addExtension("echo.binding",
getClass().getClassLoader().getResource("META-INF/sca/echo.system.scdl"));
- addExtension("idl.wsdl",
getClass().getClassLoader().getResource("META-INF/tuscany/test-interface-wsdl.scdl"));
- addExtension("databinding.axiom",
getClass().getClassLoader().getResource("META-INF/tuscany/test-databinding-axiom.scdl"));
+ addExtension("test.extensions",
getClass().getClassLoader().getResource("META-INF/tuscany/test-extensions.scdl"));
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
componentA = context.locateService(Interface1.class, "ComponentA");
Added:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-extensions.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-extensions.scdl?view=auto&rev=463860
==============================================================================
---
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-extensions.scdl
(added)
+++
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/tuscany/test-extensions.scdl
Fri Oct 13 15:41:20 2006
@@ -0,0 +1,26 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="test.extensions">
+
+ <include name="org.apache.tuscany.databinding.axiom"
scdlResource="META-INF/sca/databinding.axiom.scdl"/>
+ <include name="org.apache.tuscany.idl.wsdl"
scdlResource="META-INF/sca/idl.wsdl.scdl"/>
+
+</composite>
\ No newline at end of file
Modified:
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl?view=diff&rev=463860&r1=463859&r2=463860
==============================================================================
---
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
(original)
+++
incubator/tuscany/java/samples/sca/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
Fri Oct 13 15:41:20 2006
@@ -20,10 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
name="test.extensions">
- <include name="org.apache.tuscany.databinding.axiom"
scdlLocation="databinding.axiom.scdl"/>
- <include name="org.apache.tuscany.databinding.sdo"
scdlLocation="databinding.sdo.scdl"/>
- <include name="org.apache.tuscany.interface.wsdl"
scdlLocation="interface.wsdl.scdl"/>
- <include name="org.apache.tuscany.binding.axis2"
scdlLocation="binding.axis2.scdl"/>
+ <include name="org.apache.tuscany.databinding.axiom"
scdlResource="META-INF/sca/databinding.axiom.scdl"/>
+ <include name="org.apache.tuscany.databinding.sdo"
scdlResource="META-INF/sca/databinding.sdo.scdl"/>
+ <include name="org.apache.tuscany.idl.wsdl"
scdlResource="META-INF/sca/idl.wsdl.scdl"/>
+ <include name="org.apache.tuscany.binding.axis2"
scdlResource="META-INF/sca/binding.axis2.scdl"/>
-
-</composite>
+</composite>
\ No newline at end of file
Modified:
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl?view=diff&rev=463860&r1=463859&r2=463860
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
(original)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
Fri Oct 13 15:41:20 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,14 +16,13 @@
* 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="test.extensions">
- <include name="org.apache.tuscany.databinding.axiom"
scdlLocation="databinding.axiom.scdl"/>
- <include name="org.apache.tuscany.databinding.sdo"
scdlLocation="databinding.sdo.scdl"/>
- <include name="org.apache.tuscany.interface.wsdl"
scdlLocation="interface.wsdl.scdl"/>
- <include name="org.apache.tuscany.binding.axis2"
scdlLocation="binding.axis2.scdl"/>
-
+ <include name="org.apache.tuscany.databinding.axiom"
scdlResource="META-INF/sca/databinding.axiom.scdl"/>
+ <include name="org.apache.tuscany.databinding.sdo"
scdlResource="META-INF/sca/databinding.sdo.scdl"/>
+ <include name="org.apache.tuscany.idl.wsdl"
scdlResource="META-INF/sca/idl.wsdl.scdl"/>
+ <include name="org.apache.tuscany.binding.axis2"
scdlResource="META-INF/sca/binding.axis2.scdl"/>
</composite>
Modified:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-extensions.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-extensions.scdl?view=diff&rev=463860&r1=463859&r2=463860
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-extensions.scdl
(original)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-extensions.scdl
Fri Oct 13 15:41:20 2006
@@ -20,10 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
name="test.extensions">
- <include name="org.apache.tuscany.databinding.axiom"
scdlLocation="databinding.axiom.scdl"/>
- <include name="org.apache.tuscany.databinding.sdo"
scdlLocation="databinding.sdo.scdl"/>
- <include name="org.apache.tuscany.interface.wsdl"
scdlLocation="interface.wsdl.scdl"/>
- <include name="org.apache.tuscany.binding.axis2"
scdlLocation="binding.axis2.scdl"/>
-
+ <include name="org.apache.tuscany.databinding.axiom"
scdlResource="META-INF/sca/databinding.axiom.scdl"/>
+ <include name="org.apache.tuscany.databinding.sdo"
scdlResource="META-INF/sca/databinding.sdo.scdl"/>
+ <include name="org.apache.tuscany.idl.wsdl"
scdlResource="META-INF/sca/idl.wsdl.scdl"/>
+ <include name="org.apache.tuscany.binding.axis2"
scdlResource="META-INF/sca/binding.axis2.scdl"/>
</composite>
Added:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/binding.axis2.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/binding.axis2.scdl?view=auto&rev=463860
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/binding.axis2.scdl
(added)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/resources/META-INF/sca/binding.axis2.scdl
Fri Oct 13 15:41:20 2006
@@ -0,0 +1,48 @@
+<?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.
+-->
+<!-- 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";
+ name="org.apache.tuscany.binding.axis2.include">
+
+ <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";>
+ <group>org.apache.tuscany.sca.services.bindings</group>
+ <name>axis2</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </dependency>
+
+ <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="webservice.bindingLoader">
+ <system:implementation.system
class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader" />
+ </component>
+
+ <component name="webservice.axis2.bindingBuilder">
+ <system:implementation.system
class="org.apache.tuscany.binding.axis2.Axis2BindingBuilder" />
+ </component>
+
+ <!-- A workaround to handle inter-extension dependencies -->
+ <include name="idl.wsdl" scdlResource="META-INF/sca/idl.wsdl.scdl" />
+ <include name="databinding.axiom"
scdlResource="META-INF/sca/databinding.axiom.scdl" />
+
+</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
