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/02/24 19:22:01 UTC
svn commit: r511319 [1/2] - in
/incubator/tuscany/branches/sca-java-integration:
samples/sca/bigbank/src/main/resources/
samples/sca/bigbank/src/main/resources/META-INF/sca/
samples/sca/bigbank/src/test/java/bigbank/
samples/sca/calculator/src/main/jav...
Author: jsdelfino
Date: Sat Feb 24 10:21:58 2007
New Revision: 511319
URL: http://svn.apache.org/viewvc?view=rev&rev=511319
Log:
Cleaned up samples, moved composite files under src/main/resources. Cleaned up the bindingsTest integration tests, which are now working. Adjusted SCADefaultContainer and SCATestCase to pick up composite files under src/main/resources and allow the location of the system SCDL to be specified. Also temporarily moved the xmlbeans databinding out of the default profile as xbean.jar cannot be downloaded from Maven repos at the moment.
Added:
incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite2.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite (with props)
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite (with props)
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite (with props)
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/system.composite (with props)
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite (with props)
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/util/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/resources/bindingscomposite-system.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/resources/bindingscomposite.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/org/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/org/apache/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/org/apache/tuscany/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/resources/bindingsutility-system.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/resources/bindingsutility.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/org/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/org/apache/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/org/apache/tuscany/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/org/apache/tuscany/sca/util/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java (with props)
Removed:
incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/echo.system.scdl
incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/test/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsITest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsTestClient.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/resources/scdl/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/webapp/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/resources/META-INF/sca/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/resources/scdl/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/webapp/
Modified:
incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/test/java/bigbank/BigBankTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/test/java/echo/BootstrapTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java
incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java
incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/java/helloworld/om/HelloWorldServer.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldServer.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/test/java/helloworld/HelloWorldServerTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/java/helloworld/om/HelloWorldClient.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldClientTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldClientTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldServerTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/wsdl/testtool.wsdl
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/src/main/resources/wsdl/testutility.wsdl
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,44 @@
+<?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"
+ name="BigBank">
+
+ <service name="AccountService">
+ <interface.java interface="bigbank.account.AccountService"/>
+ <reference>AccountServiceComponent</reference>
+ </service>
+
+ <!--
+ <reference name="StockQuoteService">
+ <interface.java interface="bigbank.stock.StockQuoteService"/>
+ </reference>
+ -->
+
+
+ <component name="AccountServiceComponent">
+ <implementation.java class="bigbank.account.AccountServiceImpl"/>
+ <reference name="accountDataService">AccountDataServiceComponent</reference>
+ </component>
+
+ <component name="AccountDataServiceComponent">
+ <implementation.java class="bigbank.accountdata.AccountDataServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/main/resources/BigBank.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/test/java/bigbank/BigBankTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/test/java/bigbank/BigBankTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/test/java/bigbank/BigBankTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/src/test/java/bigbank/BigBankTestCase.java Sat Feb 24 10:21:58 2007
@@ -29,6 +29,7 @@
AccountService accountService;
protected void setUp() throws Exception {
+ super.setApplicationSCDL("BigBank.composite");
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java Sat Feb 24 10:21:58 2007
@@ -29,7 +29,7 @@
public class CalculatorClient {
public static void main(String[] args) throws Exception {
- SCAContainer.start();
+ SCAContainer.start("Calculator.composite");
CompositeContext context = CurrentCompositeContext.getContext();
CalculatorService calculatorService =
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite Sat Feb 24 10:21:58 2007
@@ -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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="Calculator">
+
+ <service name="CalculatorService">
+ <interface.java interface="calculator.CalculatorService"/>
+ <reference>CalculatorServiceComponent</reference>
+ </service>
+
+ <component name="CalculatorServiceComponent">
+ <implementation.java class="calculator.CalculatorServiceImpl"/>
+ <reference name="addService">AddServiceComponent</reference>
+ <reference name="subtractService">SubtractServiceComponent</reference>
+ <reference name="multiplyService">MultiplyServiceComponent</reference>
+ <reference name="divideService">DivideServiceComponent</reference>
+ </component>
+
+ <component name="AddServiceComponent">
+ <implementation.java class="calculator.AddServiceImpl"/>
+ </component>
+
+ <component name="SubtractServiceComponent">
+ <implementation.java class="calculator.SubtractServiceImpl"/>
+ </component>
+
+ <component name="MultiplyServiceComponent">
+ <implementation.java class="calculator.MultiplyServiceImpl"/>
+ </component>
+
+ <component name="DivideServiceComponent">
+ <implementation.java class="calculator.DivideServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java Sat Feb 24 10:21:58 2007
@@ -31,6 +31,7 @@
private CalculatorService calculatorService;
protected void setUp() throws Exception {
+ super.setApplicationSCDL("Calculator.composite");
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,36 @@
+<?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.
+-->
+<!--
+ JavaScript configuration for the launcher environment.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+
+ name="echobinding-extension">
+
+ <component name="BindingLoader">
+ <system:implementation.system class="echo.EchoBindingLoader"/>
+ </component>
+
+ <component name="BindingBuilder">
+ <system:implementation.system class="echo.EchoBuilder"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/META-INF/sca/extension.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,38 @@
+<?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" name="echo">
+
+ <service name="ClientService">
+ <interface.java class="echo.Client"/>
+ <binding.echo/>
+ <reference>Client</reference>
+ </service>
+
+ <component name="Client">
+ <implementation.java class="echo.ClientImpl"/>
+ <reference name="echoReference">EchoReference</reference>
+ </component>
+
+ <reference name="EchoReference">
+ <interface.java interface="echo.Echo"/>
+ <binding.echo/>
+ </reference>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/resources/echo.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/test/java/echo/BootstrapTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/test/java/echo/BootstrapTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/test/java/echo/BootstrapTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/test/java/echo/BootstrapTestCase.java Sat Feb 24 10:21:58 2007
@@ -29,19 +29,15 @@
public class BootstrapTestCase extends SCATestCase {
private Client client;
- private Client clientService;
public void testDemoBoot() {
client.call("foo");
- //clientService.call("foo");
}
protected void setUp() throws Exception {
- addExtension("echo.binding", getClass().getClassLoader().getResource("META-INF/sca/echo.system.scdl"));
+ super.setApplicationSCDL("echo.composite");
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
client = context.locateService(Client.class, "Client");
- // JFM temporarily commented out until we get a better solution as only local bindings are available.
- //clientService = context.locateService(Client.class, "ClientService");
}
}
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/test/java/echo/DataBindingIntegrationTestCase.java Sat Feb 24 10:21:58 2007
@@ -36,8 +36,6 @@
}
protected void setUp() throws Exception {
- // addExtension("echo.binding", getClass().getClassLoader().getResource("META-INF/sca/echo.system.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");
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java Sat Feb 24 10:21:58 2007
@@ -12,7 +12,7 @@
public class InnerCompositeClient {
public static void main(String[] args) throws Exception {
- SCAContainer.start();
+ SCAContainer.start("OuterComposite.composite");
CompositeContext context = CurrentCompositeContext.getContext();
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,44 @@
+<?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"
+ name="InnerComposite">
+
+ <service name="InnerSourceService" target="InnerSourceComponent">
+ <interface.java interface="innercomposite.Source"/>
+ <reference name="innerSource">InnerSourceComponent</reference>
+ </service>
+
+ <component name="InnerSourceComponent">
+ <implementation.java class="innercomposite.SourceImpl"/>
+ <reference name="targetReference">TargetComponentRef</reference>
+ <reference name="targetReference2">TargetComponentRef2</reference>
+ </component>
+
+ <reference name="TargetComponentRef">
+ <interface.java interface="innercomposite.Target"
+ callbackInterface="innercomposite.SourceCallback"/>
+ </reference>
+
+ <reference name="TargetComponentRef2">
+ <interface.java interface="innercomposite.Target"
+ callbackInterface="innercomposite.SourceCallback"/>
+ </reference>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite2.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite2.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite2.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite2.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,33 @@
+<?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"
+ name="InnerComposite2">
+
+ <service name="InnerTargetService" target="InnerTargetComponent">
+ <interface.java interface="innercomposite.Target"
+ callbackInterface="innercomposite.SourceCallback"/>
+ <reference name="innerSource">InnerTargetComponent</reference>
+ </service>
+
+ <component name="InnerTargetComponent">
+ <implementation.java class="innercomposite.TargetImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/InnerComposite2.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,37 @@
+<?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"
+ name="OuterComposite">
+
+ <component name="SourceComponent">
+ <implementation.composite name="InnerComposite" scdlLocation="InnerComposite.composite"/>
+ <reference name="TargetComponentRef">TargetComponent</reference>
+ <reference name="TargetComponentRef2">TargetComponent2/InnerTargetService</reference>
+ </component>
+
+ <component name="TargetComponent">
+ <implementation.java class="innercomposite.TargetImpl"/>
+ </component>
+
+ <component name="TargetComponent2">
+ <implementation.composite name="InnerComposite2" scdlLocation="InnerComposite2.composite"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/main/resources/OuterComposite.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java Sat Feb 24 10:21:58 2007
@@ -27,6 +27,7 @@
private Source source;
protected void setUp() throws Exception {
+ super.setApplicationSCDL("OuterComposite.composite");
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java Sat Feb 24 10:21:58 2007
@@ -29,7 +29,7 @@
public class SupplyChainClient {
public static final void main(String[] args) throws Exception {
- SCAContainer.start();
+ SCAContainer.start("supplychain.composite");
// Locate the Customer component and invoke it
CompositeContext context = CurrentCompositeContext.getContext();
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,42 @@
+<?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" name="supplychain">
+
+ <component name="CustomerComponent">
+ <implementation.java class="supplychain.CustomerComponentImpl" />
+ <reference name="retailer">RetailerComponent</reference>
+ </component>
+
+ <component name="RetailerComponent">
+ <implementation.java class="supplychain.RetailerComponentImpl" />
+ <reference name="warehouse">WarehouseComponent</reference>
+ </component>
+
+ <component name="WarehouseComponent">
+ <implementation.java class="supplychain.WarehouseComponentImpl" />
+ <reference name="shipper">ShipperComponent</reference>
+ </component>
+
+ <component name="ShipperComponent">
+ <implementation.java class="supplychain.ShipperComponentImpl" />
+ <reference name="customer">CustomerComponent</reference>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/main/resources/supplychain.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java Sat Feb 24 10:21:58 2007
@@ -32,6 +32,7 @@
private Customer customer;
protected void setUp() throws Exception {
+ super.setApplicationSCDL("supplychain.composite");
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/java/helloworld/om/HelloWorldServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/java/helloworld/om/HelloWorldServer.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/java/helloworld/om/HelloWorldServer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/java/helloworld/om/HelloWorldServer.java Sat Feb 24 10:21:58 2007
@@ -12,7 +12,7 @@
*/
public static void main(String[] args) {
- SCAContainer.start("META-INF/sca/helloworldws-om.composite");
+ SCAContainer.start("helloworldws-om.composite");
try {
System.out.println("HelloWorld server started");
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,34 @@
+<?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"
+ name="helloworldws-om">
+
+ <service name="HelloWorldWebService">
+ <!-- interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)"/ -->
+ <interface.java interface="helloworld.om.HelloWorldService"/>
+ <binding.ws endpoint="http://helloworld-om#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)" location="wsdl/helloworld-om.wsdl" />
+ <reference>HelloWorldServiceComponent</reference>
+ </service>
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.om.HelloWorldImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/main/resources/helloworldws-om.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java Sat Feb 24 10:21:58 2007
@@ -27,7 +27,7 @@
@Override
protected void setUp() throws Exception {
- setApplicationSCDL("META-INF/sca/helloworldws-om.composite");
+ setApplicationSCDL("helloworldws-om.composite");
super.setUp();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldServer.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldServer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldServer.java Sat Feb 24 10:21:58 2007
@@ -12,7 +12,7 @@
*/
public static void main(String[] args) {
- SCAContainer.start("META-INF/sca/helloworldws.composite");
+ SCAContainer.start("helloworldws.composite");
try {
System.out.println("HelloWorld server started");
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,34 @@
+<?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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ name="helloworldws">
+
+ <service name="HelloWorldWebService">
+ <interface.java class="helloworld.HelloWorldService" />
+ <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" / -->
+ <binding.ws endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)" location="wsdl/helloworld.wsdl" />
+ <reference>HelloWorldServiceComponent</reference>
+ </service>
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.HelloWorldImpl" />
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/helloworldws.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/system.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/system.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/system.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/system.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,36 @@
+<?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.
+-->
+<!--
+ Tuscany system configuration.
+
+ $Rev$ $Date$
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="system">
+
+ <include name="default-system"
+ scdlResource="META-INF/tuscany/default-system.composite" />
+
+ <component name="httpserver">
+ <t:implementation.system class="org.apache.tuscany.service.jetty.JettyServiceImpl" />
+ <property name="httpPort">8080</property>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/system.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/test/java/helloworld/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/test/java/helloworld/HelloWorldServerTestCase.java Sat Feb 24 10:21:58 2007
@@ -27,7 +27,7 @@
@Override
protected void setUp() throws Exception {
- setApplicationSCDL("META-INF/sca/helloworldws.composite");
+ setApplicationSCDL("helloworldws.composite");
super.setUp();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/java/helloworld/om/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/java/helloworld/om/HelloWorldClient.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/java/helloworld/om/HelloWorldClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/java/helloworld/om/HelloWorldClient.java Sat Feb 24 10:21:58 2007
@@ -43,7 +43,7 @@
public final static void main(String[] args) throws Exception {
- SCAContainer.start();
+ SCAContainer.start("helloworldwsclient-om.composite");
// Invoke the HelloWorld service
CompositeContext compositeContext = CurrentCompositeContext.getContext();
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,35 @@
+<?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="helloworldwsclient-om">
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.om.HelloWorldServiceComponent"/>
+ <reference name="helloWorldService">HelloWorldService</reference>
+ </component>
+
+ <reference name="HelloWorldService">
+ <interface.java interface="helloworld.om.HelloWorldService"/>
+ <binding.ws endpoint="http://helloworld-om#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
+ location="wsdl/helloworld-om.wsdl" />
+ </reference>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/main/resources/helloworldwsclient-om.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldClientTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldClientTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldClientTestCase.java Sat Feb 24 10:21:58 2007
@@ -42,6 +42,7 @@
@Override
protected void setUp() throws Exception {
+ setApplicationSCDL("helloworldwsclient-om.composite");
super.setUp();
CompositeContext compositeContext = CurrentCompositeContext.getContext();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-om/src/test/java/helloworld/om/HelloWorldServerTestCase.java Sat Feb 24 10:21:58 2007
@@ -27,7 +27,7 @@
@Override
protected void setUp() throws Exception {
- setApplicationSCDL("META-INF/sca/helloworldws-om.composite");
+ setApplicationSCDL("helloworldws-om.composite");
super.setUp();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java Sat Feb 24 10:21:58 2007
@@ -29,7 +29,7 @@
public class HelloWorldClient {
public final static void main(String[] args) throws Exception {
- SCAContainer.start();
+ SCAContainer.start("helloworldwsclient.composite");
CompositeContext compositeContext = CurrentCompositeContext.getContext();
HelloWorldService helloWorldService= compositeContext.locateService(HelloWorldService.class, "HelloWorldServiceComponent");
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,38 @@
+<?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="helloworldwsclient">
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.HelloWorldServiceComponent"/>
+ <reference name="helloWorldService">HelloWorldService</reference>
+ </component>
+
+ <reference name="HelloWorldService">
+ <interface.java class="helloworld.HelloWorldService" />
+ <!-- interface.wsdl xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ interface="http://helloworld#wsdl.interface(HelloWorld)"
+ wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" / -->
+ <binding.ws endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
+ location="wsdl/helloworld.wsdl" />
+ </reference>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/helloworldwsclient.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldClientTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldClientTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldClientTestCase.java Sat Feb 24 10:21:58 2007
@@ -37,6 +37,7 @@
@Override
protected void setUp() throws Exception {
+ setApplicationSCDL("helloworldwsclient.composite");
super.setUp();
CompositeContext compositeContext = CurrentCompositeContext.getContext();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/src/test/java/helloworld/HelloWorldServerTestCase.java Sat Feb 24 10:21:58 2007
@@ -27,7 +27,7 @@
@Override
protected void setUp() throws Exception {
- setApplicationSCDL("META-INF/sca/helloworldws.composite");
+ setApplicationSCDL("helloworldws.composite");
super.setUp();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java Sat Feb 24 10:21:58 2007
@@ -34,10 +34,11 @@
*/
public abstract class SCAContainer {
public static final String DEFAULT_SYSTEM_SCDL = "META-INF/tuscany/default-system.composite";
- public static final String SYSTEM_SCDL = "META-INF/tuscany/system.composite";
+ public static final String SYSTEM_SCDL = "system.composite";
public static final String EXTENSION_SCDL = "META-INF/sca/extension.composite";
public static final String SERVICE_SCDL = "META-INF/sca/service.composite";
- public static final String APPLICATION_SCDL = "META-INF/sca/application.composite";
+ public static final String META_APPLICATION_SCDL = "META-INF/sca/application.composite";
+ public static final String APPLICATION_SCDL = "application.composite";
private static SCAContainer instance;
@@ -167,7 +168,26 @@
*/
public static void start(String application) {
try {
- getInstance().startup(null, null, Thread.currentThread().getContextClassLoader().getResource(application));
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ URL applicationURL = cl.getResource(application);
+ getInstance().startup(null, null, applicationURL);
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ /**
+ * Start the Tuscany container with the given SCDL
+ *
+ * @param application The path of the system SCDL
+ * @param application The path of the application SCDL
+ */
+ public static void start(String system, String application) {
+ try {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ URL systemURL = cl.getResource(system);
+ URL applicationURL = cl.getResource(application);
+ getInstance().startup(systemURL, null, applicationURL);
} catch (Exception e) {
throw new IllegalStateException(e);
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java Sat Feb 24 10:21:58 2007
@@ -109,6 +109,9 @@
if (applicationSCDL == null) {
applicationSCDL = cl.getResource(SCAContainer.APPLICATION_SCDL);
if (applicationSCDL == null) {
+ applicationSCDL = cl.getResource(SCAContainer.META_APPLICATION_SCDL);
+ }
+ if (applicationSCDL == null) {
throw new RuntimeException("application SCDL not found: " + SCAContainer.APPLICATION_SCDL);
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/pom.xml?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/pom.xml Sat Feb 24 10:21:58 2007
@@ -40,7 +40,6 @@
<modules>
<module>databinding-jaxb</module>
<module>databinding-sdo</module>
- <module>databinding-xmlbeans</module>
</modules>
</profile>
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java Sat Feb 24 10:21:58 2007
@@ -37,12 +37,13 @@
public abstract class SCATestCase extends TestCase {
private Map<String, URL> extensions = new HashMap<String, URL>();
private URL applicationSCDL;
+ private URL systemSCDL;
protected CompositeComponent component;
protected void setUp() throws Exception {
super.setUp();
- SCAContainer.start(null, extensions == null || extensions.isEmpty() ? null :
+ SCAContainer.start(systemSCDL, extensions == null || extensions.isEmpty() ? null :
extensions.values().toArray(new URL[0]), applicationSCDL);
// FIXME: How to expose the composite component?
@@ -59,11 +60,25 @@
/**
* A TestCase can use this to override the default SCDL location
*/
+ protected void setSystemSCDL(URL systemSCDL) {
+ this.systemSCDL = systemSCDL;
+ }
+
+ /**
+ * A TestCase can use this to override the default SCDL location
+ */
protected void setApplicationSCDL(String applicationSCDL) {
this.applicationSCDL = Thread.currentThread().getContextClassLoader().getResource(applicationSCDL);
}
/**
+ * A TestCase can use this to override the default SCDL location
+ */
+ protected void setSystemSCDL(String systemSCDL) {
+ this.systemSCDL = Thread.currentThread().getContextClassLoader().getResource(systemSCDL);
+ }
+
+ /**
* Set the application scdl based on the classpath entry for a class.
* Normally this will be a class in the production code associated with this
* test case.
@@ -75,6 +90,20 @@
protected void setApplicationSCDL(Class<?> aClass, String path) throws MalformedURLException {
URL root = getRoot(aClass);
setApplicationSCDL(new URL(root, path));
+ }
+
+ /**
+ * Set the system scdl based on the classpath entry for a class.
+ * Normally this will be a class in the production code associated with this
+ * test case.
+ *
+ * @param aClass a Class from which to determine the resource base url
+ * @param path location of the system SCDL relative to the base class
+ * @throws MalformedURLException if the path is malformed
+ */
+ protected void setSystemSCDL(Class<?> aClass, String path) throws MalformedURLException {
+ URL root = getRoot(aClass);
+ setSystemSCDL(new URL(root, path));
}
/**
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml Sat Feb 24 10:21:58 2007
@@ -29,16 +29,30 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
- <artifactId>iTest-Bindings-bindingsclient</artifactId>
+ <artifactId>tuscany-itest-bindings-bindingsclient</artifactId>
<packaging>jar</packaging>
<name>SCA FVT Bindings Test Tool JSP Client</name>
- <properties>
- <!-- The installation folder of Tomcat -->
- <tomcat.dir>C:/Apache/apache-tomcat-5.5.20</tomcat.dir>
- </properties>
-
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.testing.bindingstest</groupId>
+ <artifactId>tuscany-itest-bindings-bindingscomposite</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.testing.bindingstest</groupId>
+ <artifactId>tuscany-itest-bindings-bindingsutility</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.1</artifactId>
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite Sat Feb 24 10:21:58 2007
@@ -0,0 +1,47 @@
+<?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:v="http://www.osoa.org/xmlns/sca/values/1.0"
+ xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ xmlns:dbsdo="http://incubator.apache.org/tuscany/xmlns/databinding/sdo/1.0-incubator-M2"
+ name="bindingsclient">
+
+ <!--
+ <reference name="SCATestToolSCAReference">
+ <interface.java interface="org.apache.tuscany.sca.itest.SCATestToolService"/>
+ <binding.sca uri="SCATestToolSCAServiceComponent"/>
+ </reference>
+ -->
+
+ <reference name="SCATestToolWSReference">
+ <interface.java interface="org.apache.tuscany.sca.itest.SCATestToolService" />
+ <binding.ws endpoint="http://scatesttool.scabeta1fvt#wsdl.endpoint(SCATestToolService/SCATestToolServiceSoapPort)"
+ location="wsdl/testtool.wsdl" />
+ </reference>
+
+ <!--
+ <reference name="SCATestToolEJBReference">
+ <interface.java interface="org.apache.tuscany.sca.itest.SCATestToolService"/>
+ <binding.ejb uri="corbaname:iiop:localhost:2811/NameServiceServerRoot#ejb/scabeta1fvt/scatesttool/SCATestToolServiceHome"/>
+ </reference>
+
+ -->
+</composite>
+
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/bindingsclient.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/wsdl/testtool.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/wsdl/testtool.wsdl?view=diff&rev=511319&r1=511318&r2=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/wsdl/testtool.wsdl (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/wsdl/testtool.wsdl Sat Feb 24 10:21:58 2007
@@ -263,7 +263,7 @@
<wsdl:service name="SCATestToolService">
<wsdl:port binding="tns:SCATestToolServiceSoapBinding" name="SCATestToolServiceSoapPort">
- <wsdlsoap:address location="http://localhost:8080/testtool/services/SCATestToolWSService" />
+ <wsdlsoap:address location="http://localhost:8080/services/SCATestToolWSService" />
</wsdl:port>
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java Sat Feb 24 10:21:58 2007
@@ -0,0 +1,27 @@
+package org.apache.tuscany.sca.itest;
+
+
+import java.io.IOException;
+import java.net.Socket;
+
+import org.apache.tuscany.test.SCATestCase;
+
+public class SCATestToolServerTestCase extends SCATestCase {
+
+ @Override
+ protected void setUp() throws Exception {
+ setSystemSCDL("bindingscomposite-system.composite");
+ setApplicationSCDL("bindingscomposite.composite");
+ super.setUp();
+ }
+
+ public void testPing() throws IOException {
+ new Socket("127.0.0.1", 8080);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+}
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java?view=auto&rev=511319
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java Sat Feb 24 10:21:58 2007
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.itest;
+
+import java.lang.reflect.UndeclaredThrowableException;
+
+import org.apache.tuscany.sca.util.SCATestUtilityServerTestCase;
+import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.test.SCATestCaseRunner;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+
+public class WSBindingsClientTestCase extends SCATestCase {
+ private SCATestToolService scaTestTool;
+
+ private SCATestCaseRunner toolServer;
+ private SCATestCaseRunner utilityServer;
+
+ // Hops over one composite
+ public void testOneHopPing() throws Throwable {
+ try {
+ assertTrue(scaTestTool.doOneHopPing("brio").contains("brio"));
+ } catch (UndeclaredThrowableException e) {
+ throw (e.getCause());
+ }
+ }
+
+ // Hops over two composites
+ public void testTwoHopPing() {
+ assertTrue(scaTestTool.doTwoHopPing("brio").contains("brio"));
+ }
+
+ protected void setUp() throws Exception {
+ setApplicationSCDL("bindingsclient.composite");
+ super.setUp();
+
+ toolServer = new SCATestCaseRunner(SCATestToolServerTestCase.class);
+ toolServer.setUp();
+ utilityServer = new SCATestCaseRunner(SCATestUtilityServerTestCase.class);
+ utilityServer.setUp();
+
+ CompositeContext cc = CurrentCompositeContext.getContext();
+ System.out.println("Composite Name = " + cc.getName());
+ System.out.println(CurrentCompositeContext.getContext());
+ scaTestTool =
+ (SCATestToolService)CurrentCompositeContext.getContext().locateService(SCATestToolService.class,
+ "SCATestToolWSReference");
+ if (scaTestTool == null) {
+ System.out.println("Yo Yo It is null");
+ } else {
+ System.out.println("Yo Yo It is not null: " + scaTestTool);
+ }
+
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ toolServer.tearDown();
+ utilityServer.tearDown();
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org